From 6419de194845da533ecfb1a0bb1afd92e07dab0e Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Thu, 11 Jan 2024 18:04:39 +0300
Subject: [PATCH 001/210] Basic IDEA usage locally.

Thought of implementation plan, experimented with code dependencies using
tests.
---
 .../com/diffplug/spotless/java/IdeaStep.java  | 40 +++++++++++++++
 .../main/resources/java/idea/full.clean.java  | 14 ++++++
 .../main/resources/java/idea/full.dirty.java  | 22 ++++++++
 .../diffplug/spotless/java/IdeaStepTest.java  | 50 +++++++++++++++++++
 4 files changed, 126 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
 create mode 100644 testlib/src/main/resources/java/idea/full.clean.java
 create mode 100644 testlib/src/main/resources/java/idea/full.dirty.java
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
new file mode 100644
index 0000000000..3c3021b644
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
@@ -0,0 +1,40 @@
+package com.diffplug.spotless.java;
+
+import java.io.File;
+import java.nio.file.Files;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ProcessRunner;
+
+public class IdeaStep {
+
+	private static final Logger LOGGER =
+			LoggerFactory.getLogger(IdeaStep.class);
+
+	public static FormatterStep create() {
+		// TODO: make it lazy
+		return FormatterStep.createNeverUpToDate("IDEA",
+				new FormatterFunc.NeedsFile() {
+
+					// TODO: parameterize so user is able to provide it's own file
+					// TODO: Use ForeignExe to ensure file
+					private final String binaryPath =
+							"idea";
+
+					@Override
+					public String applyWithFile(String unix, File file)
+							throws Exception {
+						try (ProcessRunner runner = new ProcessRunner()) {
+							var result = runner.exec(binaryPath, "format",
+									"-allowDefaults", file.toString());
+							LOGGER.debug("command finished with stdout: {}",
+									result.stdOutUtf8());
+							return Files.readString(file.toPath());
+						}
+					}
+				});
+	}
+
+}
diff --git a/testlib/src/main/resources/java/idea/full.clean.java b/testlib/src/main/resources/java/idea/full.clean.java
new file mode 100644
index 0000000000..84d76d4650
--- /dev/null
+++ b/testlib/src/main/resources/java/idea/full.clean.java
@@ -0,0 +1,14 @@
+package com.example;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}
+
diff --git a/testlib/src/main/resources/java/idea/full.dirty.java b/testlib/src/main/resources/java/idea/full.dirty.java
new file mode 100644
index 0000000000..83923130e6
--- /dev/null
+++ b/testlib/src/main/resources/java/idea/full.dirty.java
@@ -0,0 +1,22 @@
+package com.example;
+
+import org.springframework.boot.SpringApplication;
+
+
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@
+
+SpringBootApplication
+public 
+
+
+class     Application{
+
+    public static void      main(       String[] args) {
+        SpringApplication.     run(Application.class, args);
+    }
+
+}
+
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
new file mode 100644
index 0000000000..6a7e066b48
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
@@ -0,0 +1,50 @@
+package com.diffplug.spotless.java;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import com.diffplug.common.io.Files;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
+
+class IdeaStepTest extends ResourceHarness {
+
+	@Test
+	void name() throws Exception {
+		FormatterStep step = IdeaStep.create();
+
+		String name = step.getName();
+
+		Assertions.assertEquals("IDEA", name);
+	}
+
+	@Test
+	void notFormattings() throws Exception {
+		File cleanFile = newFile("clean.java");
+		String cleanJava =
+				ResourceHarness.getTestResource("java/idea/full.clean.java");
+		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
+		FormatterStep step = IdeaStep.create();
+
+		var result = step.format(cleanJava, cleanFile);
+
+		Assertions.assertEquals(cleanJava, result,
+				"formatting was applied to clean file");
+	}
+
+	@Test
+	void formattings() throws Exception {
+		File dirtyFile = newFile("dirty.java");
+		String dirtyJava =
+				ResourceHarness.getTestResource("java/idea/full.dirty.java");
+		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
+		FormatterStep step = IdeaStep.create();
+
+		var result = step.format(dirtyJava, dirtyFile);
+
+		Assertions.assertNotEquals(dirtyJava, result,
+				"files were not changed after reformat");
+	}
+
+}

From b84d24331f2839ca628867cb66fa94d4dbb48664 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Tue, 23 Jan 2024 22:31:38 +0300
Subject: [PATCH 002/210] Parameterize IDEA usage.

Added parameterized method to call idea formatter.
---
 .../spotless/java/IdeaFormatterFunc.java      | 66 +++++++++++++++++++
 .../com/diffplug/spotless/java/IdeaStep.java  | 52 +++++++--------
 .../diffplug/spotless/java/IdeaStepTest.java  | 45 ++++++++++++-
 3 files changed, 132 insertions(+), 31 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
new file mode 100644
index 0000000000..55e9989bda
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
@@ -0,0 +1,66 @@
+package com.diffplug.spotless.java;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.ProcessRunner;
+
+public final class IdeaFormatterFunc implements FormatterFunc.NeedsFile {
+
+	private static final Logger LOGGER =
+			LoggerFactory.getLogger(IdeaStep.class);
+
+	private static final String DEFAULT_IDEA = "idea";
+
+	// TODO: Use ForeignExe to ensure file
+	private final String binaryPath;
+	private final boolean withDefaults;
+
+	private IdeaFormatterFunc(boolean withDefaults, String binaryPath) {
+		this.withDefaults = withDefaults;
+		this.binaryPath = Objects.requireNonNullElse(binaryPath, DEFAULT_IDEA);
+	}
+
+	public static IdeaFormatterFunc allowingDefaultsWithCustomBinary(
+			String binaryPath) {
+		return new IdeaFormatterFunc(true, binaryPath);
+	}
+
+	public static IdeaFormatterFunc noDefaultsWithCustomBinary(
+			String binaryPath) {
+		return new IdeaFormatterFunc(false, binaryPath);
+	}
+
+	@Override
+	public String applyWithFile(String unix, File file) throws Exception {
+		List<String> params = getParams(file);
+
+		try (ProcessRunner runner = new ProcessRunner()) {
+			var result = runner.exec(params);
+
+			LOGGER.debug("command finished with stdout: {}",
+					result.assertExitZero(StandardCharsets.UTF_8));
+
+			return Files.readString(file.toPath());
+		}
+	}
+
+	private List<String> getParams(File file) {
+		var builder = Stream.<String>builder();
+		builder.add(binaryPath);
+		builder.add("format");
+		if (withDefaults) {
+			builder.add("-allowDefaults");
+		}
+		builder.add(file.toString());
+		return builder.build().collect(Collectors.toList());
+	}
+
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
index 3c3021b644..a2240a067d 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
@@ -1,40 +1,34 @@
 package com.diffplug.spotless.java;
 
-import java.io.File;
-import java.nio.file.Files;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.ProcessRunner;
 
-public class IdeaStep {
+public final class IdeaStep {
 
-	private static final Logger LOGGER =
-			LoggerFactory.getLogger(IdeaStep.class);
+	private IdeaStep() {}
 
 	public static FormatterStep create() {
+		return create(true);
+	}
+
+	public static FormatterStep create(boolean withDefaults) {
+		return create(true, null);
+	}
+
+	public static FormatterStep create(boolean withDefaults,
+			String binaryPath) {
+		IdeaFormatterFunc formatterFunc =
+				getFormatterFunc(withDefaults, binaryPath);
 		// TODO: make it lazy
-		return FormatterStep.createNeverUpToDate("IDEA",
-				new FormatterFunc.NeedsFile() {
-
-					// TODO: parameterize so user is able to provide it's own file
-					// TODO: Use ForeignExe to ensure file
-					private final String binaryPath =
-							"idea";
-
-					@Override
-					public String applyWithFile(String unix, File file)
-							throws Exception {
-						try (ProcessRunner runner = new ProcessRunner()) {
-							var result = runner.exec(binaryPath, "format",
-									"-allowDefaults", file.toString());
-							LOGGER.debug("command finished with stdout: {}",
-									result.stdOutUtf8());
-							return Files.readString(file.toPath());
-						}
-					}
-				});
+		return FormatterStep.createNeverUpToDate("IDEA", formatterFunc);
+	}
+
+	private static IdeaFormatterFunc getFormatterFunc(boolean withDefaults,
+			String binaryPath) {
+		if (withDefaults) {
+			return IdeaFormatterFunc
+					.allowingDefaultsWithCustomBinary(binaryPath);
+		}
+		return IdeaFormatterFunc.noDefaultsWithCustomBinary(binaryPath);
 	}
 
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
index 6a7e066b48..670faa7c8b 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
@@ -12,7 +12,7 @@ class IdeaStepTest extends ResourceHarness {
 
 	@Test
 	void name() throws Exception {
-		FormatterStep step = IdeaStep.create();
+		FormatterStep step = IdeaStep.create(true, "idea");
 
 		String name = step.getName();
 
@@ -25,7 +25,7 @@ void notFormattings() throws Exception {
 		String cleanJava =
 				ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create();
+		FormatterStep step = IdeaStep.create(true, "idea");
 
 		var result = step.format(cleanJava, cleanFile);
 
@@ -35,6 +35,20 @@ void notFormattings() throws Exception {
 
 	@Test
 	void formattings() throws Exception {
+		File dirtyFile = newFile("dirty.java");
+		String dirtyJava =
+				ResourceHarness.getTestResource("java/idea/full.dirty.java");
+		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
+		FormatterStep step = IdeaStep.create(true, "idea");
+
+		var result = step.format(dirtyJava, dirtyFile);
+
+		Assertions.assertNotEquals(dirtyJava, result,
+				"files were not changed after reformat");
+	}
+
+	@Test
+	void formattingsWorkWithDefaultParameters() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava =
 				ResourceHarness.getTestResource("java/idea/full.dirty.java");
@@ -47,4 +61,31 @@ void formattings() throws Exception {
 				"files were not changed after reformat");
 	}
 
+	@Test
+	void formattingsNotDeafaultDoesNothing() throws Exception {
+		File dirtyFile = newFile("dirty.java");
+		String dirtyJava =
+				ResourceHarness.getTestResource("java/idea/full.dirty.java");
+		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
+		FormatterStep step = IdeaStep.create(false, "idea");
+
+		var result = step.format(dirtyJava, dirtyFile);
+
+		Assertions.assertEquals(dirtyJava, result,
+				"files were changed after reformat");
+	}
+
+	@Test
+	void configureFile() throws Exception {
+		File cleanFile = newFile("clean.java");
+		String cleanJava =
+				ResourceHarness.getTestResource("java/idea/full.clean.java");
+		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
+		FormatterStep step = IdeaStep.create(true, "idea");
+
+		var result = step.format(cleanJava, cleanFile);
+
+		Assertions.assertEquals(cleanJava, result,
+				"formatting was applied to clean file");
+	}
 }

From 1d8d9b20034fa00558036d718ae2429519e1229c Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Tue, 23 Jan 2024 22:46:43 +0300
Subject: [PATCH 003/210] Verify IDEA binary.

Used ForeignExe to check idea binary
---
 .../spotless/java/IdeaFormatterFunc.java      | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
index 55e9989bda..68d26bc304 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
@@ -1,14 +1,17 @@
 package com.diffplug.spotless.java;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.diffplug.spotless.ForeignExe;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.ProcessRunner;
 
@@ -19,13 +22,30 @@ public final class IdeaFormatterFunc implements FormatterFunc.NeedsFile {
 
 	private static final String DEFAULT_IDEA = "idea";
 
-	// TODO: Use ForeignExe to ensure file
-	private final String binaryPath;
-	private final boolean withDefaults;
+	private String binaryPath;
+	private boolean withDefaults;
 
 	private IdeaFormatterFunc(boolean withDefaults, String binaryPath) {
 		this.withDefaults = withDefaults;
 		this.binaryPath = Objects.requireNonNullElse(binaryPath, DEFAULT_IDEA);
+		resolveFullBinaryPathAndCheckVersion();
+	}
+
+	private void resolveFullBinaryPathAndCheckVersion() {
+		var exe = ForeignExe.nameAndVersion(this.binaryPath, "IntelliJ IDEA")
+				.versionRegex(Pattern.compile("(IntelliJ IDEA) .*"))
+				.fixCantFind("IDEA executable cannot be found on your machine, "
+						+ "please install it and put idea binary to PATH; or report the problem")
+				.fixWrongVersion("Provided binary is not IDEA, "
+						+ "please check it and fix the problem; or report the problem");
+		try {
+			this.binaryPath = exe.confirmVersionAndGetAbsolutePath();
+		} catch (IOException e) {
+			throw new IllegalArgumentException("binary cannot be found", e);
+		} catch (InterruptedException e) {
+			throw new IllegalArgumentException(
+					"binary cannot be found, process was interrupted", e);
+		}
 	}
 
 	public static IdeaFormatterFunc allowingDefaultsWithCustomBinary(

From affd905be602b818e3084ffe186ae1149b829eb1 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Tue, 23 Jan 2024 23:17:24 +0300
Subject: [PATCH 004/210] Gradle IDEA integration.

IDEA running using gradle
---
 .../gradle/spotless/JavaExtension.java        | 34 ++++++++++++++-
 .../gradle/spotless/JavaIdeaTest.java         | 41 +++++++++++++++++++
 .../diffplug/spotless/ResourceHarness.java    | 12 ++++++
 3 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.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 db869dc4e6..a191e3ef50 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
@@ -39,6 +39,7 @@
 import com.diffplug.spotless.java.CleanthatJavaStep;
 import com.diffplug.spotless.java.FormatAnnotationsStep;
 import com.diffplug.spotless.java.GoogleJavaFormatStep;
+import com.diffplug.spotless.java.IdeaStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 import com.diffplug.spotless.java.PalantirJavaFormatStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
@@ -313,6 +314,37 @@ public EclipseConfig withP2Mirrors(Map<String, String> mirrors) {
 
 	}
 
+	public IdeaConfig idea() {
+		return new IdeaConfig();
+	}
+
+	public class IdeaConfig {
+		String binaryPath;
+		boolean withDefaults = false;
+
+		IdeaConfig() {
+			addStep(createStep());
+		}
+
+		private FormatterStep createStep() {
+			return IdeaStep.create(withDefaults, binaryPath);
+		}
+
+		public IdeaConfig binaryPath(String binaryPath) {
+			Objects.requireNonNull(binaryPath);
+			this.binaryPath = binaryPath;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public IdeaConfig withDefaults(Boolean withDefaults) {
+			Objects.requireNonNull(withDefaults);
+			this.withDefaults = withDefaults;
+			replaceStep(createStep());
+			return this;
+		}
+	}
+
 	/** Removes newlines between type annotations and types. */
 	public FormatAnnotationsConfig formatAnnotations() {
 		return new FormatAnnotationsConfig();
@@ -400,7 +432,7 @@ public CleanthatJavaConfig clearMutators() {
 		}
 
 		// 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
+		// The 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());
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
new file mode 100644
index 0000000000..d899b13203
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
@@ -0,0 +1,41 @@
+/*
+ * 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.gradle.spotless;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+
+class JavaIdeaTest extends GradleIntegrationHarness {
+	@Test
+	void idea() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"}",
+				"spotless {",
+				"  java {",
+				"    target file('test.java')",
+				"    idea().binaryPath('idea').withDefaults(true)",
+				"  }",
+				"}");
+
+		setFile("test.java").toResource("java/idea/full.dirty.java");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").notSameAsResource("java/idea/full.dirty.java");
+	}
+}
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index 0304889e1f..fcdfa2f97d 100644
--- a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
+++ b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
@@ -151,10 +151,18 @@ public void hasContent(String expected) {
 			hasContent(expected, StandardCharsets.UTF_8);
 		}
 
+		public void hasDifferentContent(String expected) {
+			hasDifferentContent(expected, StandardCharsets.UTF_8);
+		}
+
 		public void hasContent(String expected, Charset charset) {
 			assertThat(file).usingCharset(charset).hasContent(expected);
 		}
 
+		public void hasDifferentContent(String expected, Charset charset) {
+			assertThat(file).usingCharset(charset).isNotEqualTo(expected);
+		}
+
 		public void hasLines(String... lines) {
 			hasContent(String.join("\n", Arrays.asList(lines)));
 		}
@@ -163,6 +171,10 @@ public void sameAsResource(String resource) throws IOException {
 			hasContent(getTestResource(resource));
 		}
 
+		public void notSameAsResource(String resource) throws IOException {
+			hasDifferentContent(getTestResource(resource));
+		}
+
 		public void matches(Consumer<AbstractCharSequenceAssert<?, String>> conditions) throws IOException {
 			String content = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
 			conditions.accept(assertThat(content));

From effe2fcfdb0679598b6c83d2cd9dbbc965237c03 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Tue, 23 Jan 2024 23:26:10 +0300
Subject: [PATCH 005/210] Maven IDEA integration.

IDEA running using maven
---
 .../diffplug/spotless/maven/java/Idea.java    | 36 +++++++++++++++++++
 .../diffplug/spotless/maven/java/Java.java    |  4 +++
 .../spotless/maven/java/IdeaTest.java         | 36 +++++++++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
new file mode 100644
index 0000000000..182178c797
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
@@ -0,0 +1,36 @@
+/*
+ * 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.java;
+
+import org.apache.maven.plugins.annotations.Parameter;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.java.IdeaStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+public class Idea implements FormatterStepFactory {
+
+	@Parameter
+	private String binaryPath;
+
+	@Parameter
+	private Boolean withDefaults = false;
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		return IdeaStep.create(withDefaults, binaryPath);
+	}
+}
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..751da56ae9 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
@@ -68,6 +68,10 @@ public void addImportOrder(ImportOrder importOrder) {
 		addStepFactory(importOrder);
 	}
 
+	public void addIdea(Idea idea) {
+		addStepFactory(idea);
+	}
+
 	public void addPalantirJavaFormat(PalantirJavaFormat palantirJavaFormat) {
 		addStepFactory(palantirJavaFormat);
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
new file mode 100644
index 0000000000..05747eae06
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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 org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class IdeaTest extends MavenIntegrationHarness {
+	@Test
+	void idea() throws Exception {
+		setFile("test.java").toResource("java/cleanthat/MultipleMutators.dirty.test");
+		writePomWithJavaSteps(
+				"<idea>",
+				"  <binaryPath>idea</binaryPath>",
+				"  <withDefaults>true</withDefaults>",
+				"</idea>");
+
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		assertFile("test.java").notSameAsResource("java/cleanthat/MultipleMutators.dirty.test");
+	}
+}

From 8e301758f6e70d55b2d8dd3db3aff8214bf4b117 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Tue, 23 Jan 2024 23:30:56 +0300
Subject: [PATCH 006/210] Make IDEA tests special

As described here:
https://github.com/diffplug/spotless/issues/200#issuecomment-1905302847
---
 gradle/special-tests.gradle                   |  1 +
 .../gradle/spotless/JavaIdeaTest.java         |  3 +-
 .../spotless/maven/java/IdeaTest.java         |  1 +
 .../com/diffplug/spotless/tag/IdeaTest.java   | 30 +++++++++++++++++++
 .../diffplug/spotless/java/IdeaStepTest.java  |  2 ++
 5 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/IdeaTest.java

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index 8d9004a709..58a21f0cb2 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -6,6 +6,7 @@ def special = [
 	'Buf',
 	'Clang',
 	'gofmt',
+	'idea',
 	'Npm',
 	'Shfmt'
 ]
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
index d899b13203..2e51f26bb0 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
@@ -18,8 +18,9 @@
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
+import com.diffplug.spotless.tag.IdeaTest;
 
-
+@IdeaTest
 class JavaIdeaTest extends GradleIntegrationHarness {
 	@Test
 	void idea() throws IOException {
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
index 05747eae06..575f88c29c 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
@@ -19,6 +19,7 @@
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
+@com.diffplug.spotless.tag.IdeaTest
 class IdeaTest extends MavenIntegrationHarness {
 	@Test
 	void idea() throws Exception {
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/IdeaTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/IdeaTest.java
new file mode 100644
index 0000000000..79813d91d9
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/IdeaTest.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("idea")
+public @interface IdeaTest {}
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
index 670faa7c8b..b750fb5677 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
@@ -7,7 +7,9 @@
 import com.diffplug.common.io.Files;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.tag.IdeaTest;
 
+@IdeaTest
 class IdeaStepTest extends ResourceHarness {
 
 	@Test

From 1554dd6c25d293ed62d872f250aae300e32f81e9 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Tue, 23 Jan 2024 23:41:17 +0300
Subject: [PATCH 007/210] docs: 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 adf6d109e7..0e6eb2a8c7 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]
 
+* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
+
 ## [2.45.0] - 2024-01-23
 ### Added
 * Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d4ce3b410e..1f81da2ccb 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 for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
+
 ## [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-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 56cd5a5104..7488008b05 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]
 
+* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
+
 ## [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))

From 763eaac98a888f463759cd86a2bc271b688acfb3 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Tue, 23 Jan 2024 23:57:02 +0300
Subject: [PATCH 008/210] Config file for IDEA step

This part is lacking tests due to unpredictable nature of IDEA
formatting. They may change configs thus breaking build.
---
 .../spotless/java/IdeaFormatterFunc.java        | 17 ++++++++++++-----
 .../com/diffplug/spotless/java/IdeaStep.java    | 13 +++++++++----
 .../diffplug/gradle/spotless/JavaExtension.java |  8 ++++++++
 .../com/diffplug/spotless/maven/java/Idea.java  |  5 ++++-
 .../diffplug/spotless/java/IdeaStepTest.java    |  2 +-
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
index 68d26bc304..282ff37f07 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
@@ -23,10 +23,13 @@ public final class IdeaFormatterFunc implements FormatterFunc.NeedsFile {
 	private static final String DEFAULT_IDEA = "idea";
 
 	private String binaryPath;
+	private String configPath;
 	private boolean withDefaults;
 
-	private IdeaFormatterFunc(boolean withDefaults, String binaryPath) {
+	private IdeaFormatterFunc(boolean withDefaults, String binaryPath,
+			String configPath) {
 		this.withDefaults = withDefaults;
+		this.configPath = configPath;
 		this.binaryPath = Objects.requireNonNullElse(binaryPath, DEFAULT_IDEA);
 		resolveFullBinaryPathAndCheckVersion();
 	}
@@ -49,13 +52,13 @@ private void resolveFullBinaryPathAndCheckVersion() {
 	}
 
 	public static IdeaFormatterFunc allowingDefaultsWithCustomBinary(
-			String binaryPath) {
-		return new IdeaFormatterFunc(true, binaryPath);
+			String binaryPath, String configPath) {
+		return new IdeaFormatterFunc(true, binaryPath, configPath);
 	}
 
 	public static IdeaFormatterFunc noDefaultsWithCustomBinary(
-			String binaryPath) {
-		return new IdeaFormatterFunc(false, binaryPath);
+			String binaryPath, String configPath) {
+		return new IdeaFormatterFunc(false, binaryPath, configPath);
 	}
 
 	@Override
@@ -79,6 +82,10 @@ private List<String> getParams(File file) {
 		if (withDefaults) {
 			builder.add("-allowDefaults");
 		}
+		if (configPath != null) {
+			builder.add("-s");
+			builder.add(configPath);
+		}
 		builder.add(file.toString());
 		return builder.build().collect(Collectors.toList());
 	}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
index a2240a067d..b4efee7c04 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
@@ -16,19 +16,24 @@ public static FormatterStep create(boolean withDefaults) {
 
 	public static FormatterStep create(boolean withDefaults,
 			String binaryPath) {
+		return create(withDefaults, binaryPath, null);
+	}
+
+	public static FormatterStep create(boolean withDefaults,
+			String binaryPath, String configPath) {
 		IdeaFormatterFunc formatterFunc =
-				getFormatterFunc(withDefaults, binaryPath);
+				getFormatterFunc(withDefaults, binaryPath, configPath);
 		// TODO: make it lazy
 		return FormatterStep.createNeverUpToDate("IDEA", formatterFunc);
 	}
 
 	private static IdeaFormatterFunc getFormatterFunc(boolean withDefaults,
-			String binaryPath) {
+			String binaryPath, String configPath) {
 		if (withDefaults) {
 			return IdeaFormatterFunc
-					.allowingDefaultsWithCustomBinary(binaryPath);
+					.allowingDefaultsWithCustomBinary(binaryPath, configPath);
 		}
-		return IdeaFormatterFunc.noDefaultsWithCustomBinary(binaryPath);
+		return IdeaFormatterFunc.noDefaultsWithCustomBinary(binaryPath, configPath);
 	}
 
 }
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 a191e3ef50..98617fa787 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
@@ -320,6 +320,7 @@ public IdeaConfig idea() {
 
 	public class IdeaConfig {
 		String binaryPath;
+		String configPath;
 		boolean withDefaults = false;
 
 		IdeaConfig() {
@@ -337,6 +338,13 @@ public IdeaConfig binaryPath(String binaryPath) {
 			return this;
 		}
 
+		public IdeaConfig configPath(String configPath) {
+			Objects.requireNonNull(configPath);
+			this.configPath = configPath;
+			replaceStep(createStep());
+			return this;
+		}
+
 		public IdeaConfig withDefaults(Boolean withDefaults) {
 			Objects.requireNonNull(withDefaults);
 			this.withDefaults = withDefaults;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
index 182178c797..83decc6867 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
@@ -26,11 +26,14 @@ public class Idea implements FormatterStepFactory {
 	@Parameter
 	private String binaryPath;
 
+	@Parameter
+	private String configPath;
+
 	@Parameter
 	private Boolean withDefaults = false;
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		return IdeaStep.create(withDefaults, binaryPath);
+		return IdeaStep.create(withDefaults, binaryPath, configPath);
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
index b750fb5677..38606c3657 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
@@ -64,7 +64,7 @@ void formattingsWorkWithDefaultParameters() throws Exception {
 	}
 
 	@Test
-	void formattingsNotDeafaultDoesNothing() throws Exception {
+	void formattingsWithOutDefaultDoesNothing() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava =
 				ResourceHarness.getTestResource("java/idea/full.dirty.java");

From fdb73b7994f8c15c69e9d3017d8a27eac471d664 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Wed, 24 Jan 2024 09:56:28 +0300
Subject: [PATCH 009/210] CI Fixes

---
 .../spotless/java/IdeaFormatterFunc.java      | 33 +++++++++++++++----
 .../com/diffplug/spotless/java/IdeaStep.java  | 28 ++++++++++++----
 .../gradle/spotless/JavaExtension.java        |  8 ++---
 3 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
index 282ff37f07..779dc3b563 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.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.java;
 
 import java.io.File;
@@ -9,25 +24,29 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import javax.annotation.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import com.diffplug.spotless.ForeignExe;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.ProcessRunner;
 
 public final class IdeaFormatterFunc implements FormatterFunc.NeedsFile {
 
-	private static final Logger LOGGER =
-			LoggerFactory.getLogger(IdeaStep.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(IdeaStep.class);
 
 	private static final String DEFAULT_IDEA = "idea";
 
 	private String binaryPath;
+	@Nullable
 	private String configPath;
 	private boolean withDefaults;
 
-	private IdeaFormatterFunc(boolean withDefaults, String binaryPath,
-			String configPath) {
+	private IdeaFormatterFunc(boolean withDefaults, @Nullable String binaryPath,
+			@Nullable String configPath) {
 		this.withDefaults = withDefaults;
 		this.configPath = configPath;
 		this.binaryPath = Objects.requireNonNullElse(binaryPath, DEFAULT_IDEA);
@@ -52,12 +71,12 @@ private void resolveFullBinaryPathAndCheckVersion() {
 	}
 
 	public static IdeaFormatterFunc allowingDefaultsWithCustomBinary(
-			String binaryPath, String configPath) {
+			@Nullable String binaryPath, @Nullable String configPath) {
 		return new IdeaFormatterFunc(true, binaryPath, configPath);
 	}
 
 	public static IdeaFormatterFunc noDefaultsWithCustomBinary(
-			String binaryPath, String configPath) {
+			@Nullable String binaryPath, @Nullable String configPath) {
 		return new IdeaFormatterFunc(false, binaryPath, configPath);
 	}
 
@@ -76,7 +95,7 @@ public String applyWithFile(String unix, File file) throws Exception {
 	}
 
 	private List<String> getParams(File file) {
-		var builder = Stream.<String>builder();
+		var builder = Stream.<String> builder();
 		builder.add(binaryPath);
 		builder.add("format");
 		if (withDefaults) {
diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
index b4efee7c04..8839bbdba0 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
@@ -1,5 +1,22 @@
+/*
+ * 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.java;
 
+import javax.annotation.Nullable;
+
 import com.diffplug.spotless.FormatterStep;
 
 public final class IdeaStep {
@@ -11,24 +28,23 @@ public static FormatterStep create() {
 	}
 
 	public static FormatterStep create(boolean withDefaults) {
-		return create(true, null);
+		return create(withDefaults, null);
 	}
 
 	public static FormatterStep create(boolean withDefaults,
-			String binaryPath) {
+			@Nullable String binaryPath) {
 		return create(withDefaults, binaryPath, null);
 	}
 
 	public static FormatterStep create(boolean withDefaults,
-			String binaryPath, String configPath) {
-		IdeaFormatterFunc formatterFunc =
-				getFormatterFunc(withDefaults, binaryPath, configPath);
+			@Nullable String binaryPath, @Nullable String configPath) {
+		IdeaFormatterFunc formatterFunc = getFormatterFunc(withDefaults, binaryPath, configPath);
 		// TODO: make it lazy
 		return FormatterStep.createNeverUpToDate("IDEA", formatterFunc);
 	}
 
 	private static IdeaFormatterFunc getFormatterFunc(boolean withDefaults,
-			String binaryPath, String configPath) {
+			@Nullable String binaryPath, @Nullable String configPath) {
 		if (withDefaults) {
 			return IdeaFormatterFunc
 					.allowingDefaultsWithCustomBinary(binaryPath, configPath);
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 98617fa787..5acd080d16 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
@@ -319,16 +319,16 @@ public IdeaConfig idea() {
 	}
 
 	public class IdeaConfig {
-		String binaryPath;
-		String configPath;
-		boolean withDefaults = false;
+		private String binaryPath;
+		private String configPath;
+		private boolean withDefaults = false;
 
 		IdeaConfig() {
 			addStep(createStep());
 		}
 
 		private FormatterStep createStep() {
-			return IdeaStep.create(withDefaults, binaryPath);
+			return IdeaStep.create(withDefaults, binaryPath, configPath);
 		}
 
 		public IdeaConfig binaryPath(String binaryPath) {

From c6c6ccefc0fa4c7dbc18c51badc8571d9484eaf0 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Wed, 24 Jan 2024 10:11:17 +0300
Subject: [PATCH 010/210] docs: fixed structure of CHANGES.md

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

diff --git a/CHANGES.md b/CHANGES.md
index 2dc29c4809..d3bace3e90 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,13 +12,12 @@ 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)) 
+* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 
-* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
-
 ## [2.45.0] - 2024-01-23
 ### Added
 * Support for `gofmt` ([#2001](https://github.com/diffplug/spotless/pull/2001))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1544f9b705..bb03847254 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,11 +3,11 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 
-* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
-
 ## [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-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 57607c5637..17f50162b4 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,10 +3,11 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
 ### Fixed
 * Ignore system git config when running tests ([#1990](https://github.com/diffplug/spotless/issues/1990))
 
-* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
 
 ## [2.43.0] - 2024-01-23
 ### Added

From 91235270c3abfaef00927e2606c850d9c7eb9d54 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Sat, 27 Jan 2024 14:44:13 +0300
Subject: [PATCH 011/210] Create State object

This object is now resides in IdeaStep
---
 .../spotless/java/IdeaFormatterFunc.java      | 112 ------------------
 .../com/diffplug/spotless/java/IdeaStep.java  | 100 ++++++++++++++--
 2 files changed, 91 insertions(+), 121 deletions(-)
 delete mode 100644 lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
deleted file mode 100644
index 779dc3b563..0000000000
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaFormatterFunc.java
+++ /dev/null
@@ -1,112 +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.java;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-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;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.diffplug.spotless.ForeignExe;
-import com.diffplug.spotless.FormatterFunc;
-import com.diffplug.spotless.ProcessRunner;
-
-public final class IdeaFormatterFunc implements FormatterFunc.NeedsFile {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(IdeaStep.class);
-
-	private static final String DEFAULT_IDEA = "idea";
-
-	private String binaryPath;
-	@Nullable
-	private String configPath;
-	private boolean withDefaults;
-
-	private IdeaFormatterFunc(boolean withDefaults, @Nullable String binaryPath,
-			@Nullable String configPath) {
-		this.withDefaults = withDefaults;
-		this.configPath = configPath;
-		this.binaryPath = Objects.requireNonNullElse(binaryPath, DEFAULT_IDEA);
-		resolveFullBinaryPathAndCheckVersion();
-	}
-
-	private void resolveFullBinaryPathAndCheckVersion() {
-		var exe = ForeignExe.nameAndVersion(this.binaryPath, "IntelliJ IDEA")
-				.versionRegex(Pattern.compile("(IntelliJ IDEA) .*"))
-				.fixCantFind("IDEA executable cannot be found on your machine, "
-						+ "please install it and put idea binary to PATH; or report the problem")
-				.fixWrongVersion("Provided binary is not IDEA, "
-						+ "please check it and fix the problem; or report the problem");
-		try {
-			this.binaryPath = exe.confirmVersionAndGetAbsolutePath();
-		} catch (IOException e) {
-			throw new IllegalArgumentException("binary cannot be found", e);
-		} catch (InterruptedException e) {
-			throw new IllegalArgumentException(
-					"binary cannot be found, process was interrupted", e);
-		}
-	}
-
-	public static IdeaFormatterFunc allowingDefaultsWithCustomBinary(
-			@Nullable String binaryPath, @Nullable String configPath) {
-		return new IdeaFormatterFunc(true, binaryPath, configPath);
-	}
-
-	public static IdeaFormatterFunc noDefaultsWithCustomBinary(
-			@Nullable String binaryPath, @Nullable String configPath) {
-		return new IdeaFormatterFunc(false, binaryPath, configPath);
-	}
-
-	@Override
-	public String applyWithFile(String unix, File file) throws Exception {
-		List<String> params = getParams(file);
-
-		try (ProcessRunner runner = new ProcessRunner()) {
-			var result = runner.exec(params);
-
-			LOGGER.debug("command finished with stdout: {}",
-					result.assertExitZero(StandardCharsets.UTF_8));
-
-			return Files.readString(file.toPath());
-		}
-	}
-
-	private List<String> getParams(File file) {
-		var builder = Stream.<String> builder();
-		builder.add(binaryPath);
-		builder.add("format");
-		if (withDefaults) {
-			builder.add("-allowDefaults");
-		}
-		if (configPath != null) {
-			builder.add("-s");
-			builder.add(configPath);
-		}
-		builder.add(file.toString());
-		return builder.build().collect(Collectors.toList());
-	}
-
-}
diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
index 8839bbdba0..cfe8c5f349 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
@@ -15,12 +15,31 @@
  */
 package com.diffplug.spotless.java;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+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;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.diffplug.spotless.ForeignExe;
+import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ProcessRunner;
 
 public final class IdeaStep {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(IdeaStep.class);
+
 	private IdeaStep() {}
 
 	public static FormatterStep create() {
@@ -38,18 +57,81 @@ public static FormatterStep create(boolean withDefaults,
 
 	public static FormatterStep create(boolean withDefaults,
 			@Nullable String binaryPath, @Nullable String configPath) {
-		IdeaFormatterFunc formatterFunc = getFormatterFunc(withDefaults, binaryPath, configPath);
-		// TODO: make it lazy
-		return FormatterStep.createNeverUpToDate("IDEA", formatterFunc);
+		return FormatterStep.createLazy("IDEA",
+				() -> createState(withDefaults, binaryPath, configPath),
+				state -> state);
 	}
 
-	private static IdeaFormatterFunc getFormatterFunc(boolean withDefaults,
+	private static State createState(boolean withDefaults,
 			@Nullable String binaryPath, @Nullable String configPath) {
-		if (withDefaults) {
-			return IdeaFormatterFunc
-					.allowingDefaultsWithCustomBinary(binaryPath, configPath);
-		}
-		return IdeaFormatterFunc.noDefaultsWithCustomBinary(binaryPath, configPath);
+		return new State(withDefaults, binaryPath, configPath);
 	}
 
+	private static class State
+			implements FormatterFunc.NeedsFile, Serializable {
+
+		private static final long serialVersionUID = -1825662355363926318L;
+		private static final String DEFAULT_IDEA = "idea";
+
+		private String binaryPath;
+		@Nullable
+		private String configPath;
+		private boolean withDefaults;
+
+		private State(boolean withDefaults, @Nullable String binaryPath,
+				@Nullable String configPath) {
+			this.withDefaults = withDefaults;
+			this.configPath = configPath;
+			this.binaryPath = Objects.requireNonNullElse(binaryPath, DEFAULT_IDEA);
+			resolveFullBinaryPathAndCheckVersion();
+		}
+
+		private void resolveFullBinaryPathAndCheckVersion() {
+			var exe = ForeignExe
+					.nameAndVersion(this.binaryPath, "IntelliJ IDEA")
+					.versionRegex(Pattern.compile("(IntelliJ IDEA) .*"))
+					.fixCantFind(
+							"IDEA executable cannot be found on your machine, "
+									+ "please install it and put idea binary to PATH; or report the problem")
+					.fixWrongVersion("Provided binary is not IDEA, "
+							+ "please check it and fix the problem; or report the problem");
+			try {
+				this.binaryPath = exe.confirmVersionAndGetAbsolutePath();
+			} catch (IOException e) {
+				throw new IllegalArgumentException("binary cannot be found", e);
+			} catch (InterruptedException e) {
+				throw new IllegalArgumentException(
+						"binary cannot be found, process was interrupted", e);
+			}
+		}
+
+		@Override
+		public String applyWithFile(String unix, File file) throws Exception {
+			List<String> params = getParams(file);
+
+			try (ProcessRunner runner = new ProcessRunner()) {
+				var result = runner.exec(params);
+
+				LOGGER.debug("command finished with stdout: {}",
+						result.assertExitZero(StandardCharsets.UTF_8));
+
+				return Files.readString(file.toPath());
+			}
+		}
+
+		private List<String> getParams(File file) {
+			var builder = Stream.<String> builder();
+			builder.add(binaryPath);
+			builder.add("format");
+			if (withDefaults) {
+				builder.add("-allowDefaults");
+			}
+			if (configPath != null) {
+				builder.add("-s");
+				builder.add(configPath);
+			}
+			builder.add(file.toString());
+			return builder.build().collect(Collectors.toList());
+		}
+	}
 }

From a0bde464fbbeb376332b6048452ec401f03f87c9 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Mon, 12 Feb 2024 16:04:52 -0800
Subject: [PATCH 012/210] spotlessApply

---
 .../gradle/spotless/JavaIdeaTest.java         |  1 +
 .../diffplug/spotless/maven/java/Idea.java    |  1 +
 .../diffplug/spotless/maven/java/Java.java    |  2 +-
 .../spotless/maven/java/IdeaTest.java         |  2 +-
 .../diffplug/spotless/ResourceHarness.java    |  2 +-
 .../diffplug/spotless/java/IdeaStepTest.java  | 32 +++++++++++++------
 6 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
index 2e51f26bb0..b154c2d851 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
+
 import com.diffplug.spotless.tag.IdeaTest;
 
 @IdeaTest
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
index 83decc6867..8981a9dc9b 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.maven.java;
 
 import org.apache.maven.plugins.annotations.Parameter;
+
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.java.IdeaStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
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 751da56ae9..20a2db96f7 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-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/java/IdeaTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
index 575f88c29c..c11b2a64d1 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.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.
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index fcdfa2f97d..b704d5c981 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.
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
index 38606c3657..98de28627a 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
@@ -1,9 +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.java;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+
 import com.diffplug.common.io.Files;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
@@ -24,8 +41,7 @@ void name() throws Exception {
 	@Test
 	void notFormattings() throws Exception {
 		File cleanFile = newFile("clean.java");
-		String cleanJava =
-				ResourceHarness.getTestResource("java/idea/full.clean.java");
+		String cleanJava = ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
 		FormatterStep step = IdeaStep.create(true, "idea");
 
@@ -38,8 +54,7 @@ void notFormattings() throws Exception {
 	@Test
 	void formattings() throws Exception {
 		File dirtyFile = newFile("dirty.java");
-		String dirtyJava =
-				ResourceHarness.getTestResource("java/idea/full.dirty.java");
+		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
 		FormatterStep step = IdeaStep.create(true, "idea");
 
@@ -52,8 +67,7 @@ void formattings() throws Exception {
 	@Test
 	void formattingsWorkWithDefaultParameters() throws Exception {
 		File dirtyFile = newFile("dirty.java");
-		String dirtyJava =
-				ResourceHarness.getTestResource("java/idea/full.dirty.java");
+		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
 		FormatterStep step = IdeaStep.create();
 
@@ -66,8 +80,7 @@ void formattingsWorkWithDefaultParameters() throws Exception {
 	@Test
 	void formattingsWithOutDefaultDoesNothing() throws Exception {
 		File dirtyFile = newFile("dirty.java");
-		String dirtyJava =
-				ResourceHarness.getTestResource("java/idea/full.dirty.java");
+		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
 		FormatterStep step = IdeaStep.create(false, "idea");
 
@@ -80,8 +93,7 @@ void formattingsWithOutDefaultDoesNothing() throws Exception {
 	@Test
 	void configureFile() throws Exception {
 		File cleanFile = newFile("clean.java");
-		String cleanJava =
-				ResourceHarness.getTestResource("java/idea/full.clean.java");
+		String cleanJava = ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
 		FormatterStep step = IdeaStep.create(true, "idea");
 

From 6efa10afe558050e6fb14f741a55020895a57e49 Mon Sep 17 00:00:00 2001
From: Tomas Bjerre <tomas.bjerre85@gmail.com>
Date: Wed, 11 Dec 2024 08:58:33 +0100
Subject: [PATCH 013/210] feat: supply eclipse formatter settings as XML
 content

---
 CHANGES.md                                    |  1 +
 .../spotless/extra/EquoBasedStepBuilder.java  | 19 ++++--
 .../spotless/FormatterProperties.java         | 65 +++++++++++++++----
 plugin-gradle/README.md                       | 18 ++++-
 .../gradle/spotless/BaseGroovyExtension.java  |  7 ++
 .../gradle/spotless/CppExtension.java         |  7 ++
 .../gradle/spotless/JavaExtension.java        |  7 ++
 .../gradle/spotless/JavaEclipseTest.java      | 25 ++++++-
 .../spotless/FormatterPropertiesTest.java     | 57 +++++++++++-----
 9 files changed, 168 insertions(+), 38 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 22b2b73e27..9465f8afe4 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
+* TODO ([#](https://github.com/diffplug/spotless/pull/X))
 * 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))
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..267d6cc496 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
@@ -56,6 +56,7 @@ public abstract class EquoBasedStepBuilder {
 	private String formatterVersion;
 	private Iterable<File> settingsFiles = new ArrayList<>();
 	private List<String> settingProperties = new ArrayList<>();
+	private List<String> settingXml = new ArrayList<>();
 	private Map<String, String> p2Mirrors = Map.of();
 	private File cacheDirectory;
 
@@ -86,6 +87,10 @@ public void setPropertyPreferences(List<String> propertyPreferences) {
 		this.settingProperties = propertyPreferences;
 	}
 
+	public void setXmlPreferences(List<String> settingXml) {
+		this.settingXml = settingXml;
+	}
+
 	public void setP2Mirrors(Map<String, String> p2Mirrors) {
 		this.p2Mirrors = Map.copyOf(p2Mirrors);
 	}
@@ -119,7 +124,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, settingProperties, FileSignature.promise(settingsFiles), JarState.promise(() -> {
+		var roundtrippableState = new EquoStep(formatterVersion, settingProperties, settingXml, FileSignature.promise(settingsFiles), JarState.promise(() -> {
 			P2QueryResult query;
 			try {
 				if (null != cacheDirectory) {
@@ -174,23 +179,26 @@ static class EquoStep implements Serializable {
 		private final JarState.Promised jarPromise;
 		private final ImmutableMap<String, String> stepProperties;
 		private List<String> settingProperties;
+		private List<String> settingXml;
 
 		EquoStep(
 				String semanticVersion,
 				List<String> settingProperties,
+				List<String> settingXml,
 				FileSignature.Promised settingsPromise,
 				JarState.Promised jarPromise,
 				ImmutableMap<String, String> stepProperties) {
 
 			this.semanticVersion = semanticVersion;
 			this.settingProperties = Optional.ofNullable(settingProperties).orElse(new ArrayList<>());
+			this.settingXml = Optional.ofNullable(settingXml).orElse(new ArrayList<>());
 			this.settingsPromise = settingsPromise;
 			this.jarPromise = jarPromise;
 			this.stepProperties = stepProperties;
 		}
 
 		private State state() {
-			return new State(semanticVersion, jarPromise.get(), settingProperties, settingsPromise.get(), stepProperties);
+			return new State(semanticVersion, jarPromise.get(), settingProperties, settingXml, settingsPromise.get(), stepProperties);
 		}
 	}
 
@@ -205,11 +213,13 @@ public static class State implements Serializable {
 		final FileSignature settingsFiles;
 		final ImmutableMap<String, String> stepProperties;
 		private List<String> settingProperties;
+		private List<String> settingXml;
 
-		public State(String semanticVersion, JarState jarState, List<String> settingProperties, FileSignature settingsFiles, ImmutableMap<String, String> stepProperties) {
+		public State(String semanticVersion, JarState jarState, List<String> settingProperties, List<String> settingXml, FileSignature settingsFiles, ImmutableMap<String, String> stepProperties) {
 			this.semanticVersion = semanticVersion;
 			this.jarState = jarState;
 			this.settingProperties = Optional.ofNullable(settingProperties).orElse(new ArrayList<>());
+			this.settingXml = Optional.ofNullable(settingXml).orElse(new ArrayList<>());
 			this.settingsFiles = settingsFiles;
 			this.stepProperties = stepProperties;
 		}
@@ -225,7 +235,8 @@ public String getSemanticVersion() {
 		public Properties getPreferences() {
 			FormatterProperties fromFiles = FormatterProperties.from(settingsFiles.files());
 			FormatterProperties fromPropertiesContent = FormatterProperties.fromPropertiesContent(settingProperties);
-			return FormatterProperties.merge(fromFiles.getProperties(), fromPropertiesContent.getProperties()).getProperties();
+			FormatterProperties fromXmlContent = FormatterProperties.fromXmlContent(settingXml);
+			return FormatterProperties.merge(fromFiles.getProperties(), fromPropertiesContent.getProperties(), fromXmlContent.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 5ea32f8f99..455318e38f 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
@@ -20,6 +20,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -28,6 +29,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -90,6 +92,25 @@ public static FormatterProperties fromPropertiesContent(Iterable<String> content
 		return properties;
 	}
 
+	public static FormatterProperties fromXmlContent(final Iterable<String> content) throws IllegalArgumentException {
+		final List<String> nonNullElements = toNullHostileList(content);
+		final FormatterProperties properties = new FormatterProperties();
+		nonNullElements.forEach(contentElement -> {
+			try {
+				final Properties newSettings = FileParser.XML.executeXmlContent(contentElement);
+				properties.properties.putAll(newSettings);
+			} catch (IOException | IllegalArgumentException exception) {
+				String message = String.format("Failed to add preferences from XML:%n%s%n", contentElement);
+				final String detailedMessage = exception.getMessage();
+				if (null != detailedMessage) {
+					message += String.format(" %s", detailedMessage);
+				}
+				throw new IllegalArgumentException(message, exception);
+			}
+		});
+		return properties;
+	}
+
 	public static FormatterProperties merge(Properties... properties) {
 		FormatterProperties merged = new FormatterProperties();
 		List.of(properties).stream().forEach((source) -> merged.properties.putAll(source));
@@ -139,20 +160,40 @@ protected Properties execute(final File file) throws IOException, IllegalArgumen
 				}
 				return properties;
 			}
+
+			@Override
+			protected Properties executeXmlContent(String content) throws IOException, IllegalArgumentException {
+				throw new RuntimeException("Not implemented");
+			}
 		},
 
 		XML("xml") {
 			@Override
 			protected Properties execute(final File file) throws IOException, IllegalArgumentException {
-				Node rootNode = getRootNode(file);
+				return executeWithSupplier(() -> {
+					try {
+						return new FileInputStream(file);
+					} catch (FileNotFoundException e) {
+						throw new RuntimeException("File not found: " + file, e);
+					}
+				});
+			}
+
+			@Override
+			protected Properties executeXmlContent(String content) throws IOException, IllegalArgumentException {
+				return executeWithSupplier(() -> new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)));
+			}
+
+			private Properties executeWithSupplier(Supplier<InputStream> isSupplier) throws IOException, IllegalArgumentException {
+				Node rootNode = getRootNode(isSupplier.get());
 				String nodeName = rootNode.getNodeName();
 				if (null == nodeName) {
 					throw new IllegalArgumentException("XML document does not contain a root node.");
 				}
-				return XmlParser.parse(file, rootNode);
+				return XmlParser.parse(isSupplier.get(), rootNode);
 			}
 
-			private Node getRootNode(final File file) throws IOException, IllegalArgumentException {
+			private Node getRootNode(final InputStream is) throws IOException, IllegalArgumentException {
 				try {
 					DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 					/*
@@ -166,7 +207,7 @@ private Node getRootNode(final File file) throws IOException, IllegalArgumentExc
 					 */
 					dbf.setFeature(LOAD_EXTERNAL_DTD_PROP, false);
 					DocumentBuilder db = dbf.newDocumentBuilder();
-					return db.parse(file).getDocumentElement();
+					return db.parse(is).getDocumentElement();
 				} catch (SAXException | ParserConfigurationException e) {
 					throw new IllegalArgumentException("File has no valid XML syntax.", e);
 				}
@@ -186,6 +227,8 @@ private Node getRootNode(final File file) throws IOException, IllegalArgumentExc
 
 		protected abstract Properties execute(File file) throws IOException, IllegalArgumentException;
 
+		protected abstract Properties executeXmlContent(String content) throws IOException, IllegalArgumentException;
+
 		public static Properties parse(final File file) throws IOException, IllegalArgumentException {
 			String fileNameExtension = getFileNameExtension(file);
 			for (FileParser parser : FileParser.values()) {
@@ -211,19 +254,17 @@ private static String getFileNameExtension(File file) {
 	private enum XmlParser {
 		PROPERTIES("properties") {
 			@Override
-			protected Properties execute(final File xmlFile, final Node rootNode)
+			protected Properties execute(final InputStream xmlFile, final Node rootNode)
 					throws IOException, IllegalArgumentException {
 				final Properties properties = new Properties();
-				try (InputStream xmlInput = new FileInputStream(xmlFile)) {
-					properties.loadFromXML(xmlInput);
-				}
+				properties.loadFromXML(xmlFile);
 				return properties;
 			}
 		},
 
 		PROFILES("profiles") {
 			@Override
-			protected Properties execute(File file, Node rootNode) throws IOException, IllegalArgumentException {
+			protected Properties execute(InputStream file, Node rootNode) throws IOException, IllegalArgumentException {
 				final Properties properties = new Properties();
 				Node firstProfile = getSingleProfile(rootNode);
 				for (Object settingObj : getChildren(firstProfile, "setting")) {
@@ -285,14 +326,14 @@ public String toString() {
 			return this.rootNodeName;
 		}
 
-		protected abstract Properties execute(File file, Node rootNode) throws IOException, IllegalArgumentException;
+		protected abstract Properties execute(InputStream is, Node rootNode) throws IOException, IllegalArgumentException;
 
-		public static Properties parse(final File file, final Node rootNode)
+		public static Properties parse(final InputStream is, final Node rootNode)
 				throws IOException, IllegalArgumentException {
 			String rootNodeName = rootNode.getNodeName();
 			for (XmlParser parser : XmlParser.values()) {
 				if (parser.rootNodeName.equals(rootNodeName)) {
-					return parser.execute(file, rootNode);
+					return parser.execute(is, rootNode);
 				}
 			}
 			String msg = String.format("The XML root node '%1$s' is not part of the supported root nodes [%2$s].",
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 58db554e66..6ed02b0f2b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -262,10 +262,14 @@ 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
+    // Or supply the configuration properties as a string
     eclipse('4.26').configProperties("""
     ...
     """)
+    // Or supply the configuration XML as a string
+    eclipse('4.26').configXml("""
+    ...
+    """)
     // 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/']) 
@@ -422,10 +426,14 @@ 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
+    // Or supply the configuration properties as a string
     greclipse('4.26').configProperties("""
     ...
     """)
+    // Or supply the configuration XML as a string
+    greclipse('4.26').configXml("""
+    ...
+    """)
 ```
 
 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.
@@ -580,10 +588,14 @@ spotles {
   cpp {
     // version and configFile are both optional
     eclipseCdt('4.13.0').configFile('eclipse-cdt.xml')
-    // Or supply the configuration as a string
+    // Or supply the configuration properties as a string
     eclipseCdt('4.13.0').configProperties("""
     ...
     """)
+    // Or supply the configuration XML as a string
+    eclipseCdt('4.13.0').configXml("""
+    ...
+    """)
   }
 }
 ```
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 83d678c46c..37712a470b 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
@@ -80,6 +80,13 @@ public GrEclipseConfig configProperties(String... configs) {
 			return this;
 		}
 
+		public GrEclipseConfig configXml(String... configs) {
+			requireElementsNonNull(configs);
+			builder.setXmlPreferences(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 f2d6ee91bb..db7d9bee9a 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
@@ -69,6 +69,13 @@ public EclipseConfig configProperties(String... configs) {
 			return this;
 		}
 
+		public EclipseConfig configXml(String... configs) {
+			requireElementsNonNull(configs);
+			builder.setXmlPreferences(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 b7d3c84304..343092b4ad 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
@@ -312,6 +312,13 @@ public EclipseConfig configProperties(String... configs) {
 			return this;
 		}
 
+		public EclipseConfig configXml(String... configs) {
+			requireElementsNonNull(configs);
+			builder.setXmlPreferences(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
index c102b7abe1..1ef433acd6 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java
@@ -21,7 +21,7 @@
 
 class JavaEclipseTest extends GradleIntegrationHarness {
 	@Test
-	void settingsWithContentWithoutFile() throws IOException {
+	void settingsWithProprtiesContent() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"  id 'com.diffplug.spotless'",
@@ -37,4 +37,27 @@ void settingsWithContentWithoutFile() throws IOException {
 
 		gradleRunner().withArguments("spotlessApply").build();
 	}
+
+	@Test
+	void settingsWithXmlContent() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"  id 'java'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"  java {  eclipse().configProperties(\"\"\"",
+				"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>",
+				"<profiles version=\"12\">",
+				"  <profile kind=\"CodeFormatterProfile\" name=\"Spotless\" version=\"12\">",
+				"    <setting id=\"valid_line_oriented.prefs.string\" value=\"string\" />",
+				"  </profile>",
+				"</profiles>",
+				"\"\"\")  }",
+				"}");
+
+		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 8333fcc41d..58ae1c913e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 import java.io.IOException;
@@ -52,8 +53,12 @@ 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 List<String> validXmlResources() {
+		return List.of(VALID_SETTINGS_RESOURCES).stream().filter(it -> it.endsWith(".xml")).collect(Collectors.toList());
+	}
+
+	private List<String> invalidXmlResources() {
+		return List.of(INVALID_SETTINGS_RESOURCES).stream().filter(it -> it.endsWith(".xml")).collect(Collectors.toList());
 	}
 
 	private static final String[] VALID_VALUES = {
@@ -86,6 +91,18 @@ void differentPropertyFileTypes_content_properties() throws IOException {
 		}
 	}
 
+	@Test
+	void differentPropertyFileTypes_content_xml() throws IOException {
+		for (String settingsResource : validXmlResources()) {
+			File settingsFile = createTestFile(settingsResource);
+			String content = Files.readString(settingsFile.toPath());
+			FormatterProperties preferences = FormatterProperties.fromXmlContent(List.of(content));
+			assertFor(preferences)
+					.containsSpecificValuesOf(settingsFile)
+					.containsCommonValueOf(settingsFile);
+		}
+	}
+
 	@Test
 	void multiplePropertyFiles() throws IOException {
 		LinkedList<File> settingsFiles = new LinkedList<>();
@@ -116,6 +133,22 @@ void multiplePropertyFiles_content_properties() throws IOException {
 				.containsCommonValueOf(settingsFiles.getLast());
 	}
 
+	@Test
+	void multiplePropertyFiles_content_xml() throws IOException {
+		LinkedList<File> settingsFiles = new LinkedList<>();
+		LinkedList<String> content = new LinkedList<>();
+		for (String settingsResource : validXmlResources()) {
+			File settingsFile = createTestFile(settingsResource);
+			content.add(Files.readString(settingsFile.toPath()));
+			settingsFiles.add(settingsFile);
+		}
+		FormatterProperties preferences = FormatterProperties.fromXmlContent(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) {
@@ -136,22 +169,10 @@ 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();
+	void invalidPropertyFiles_content_xml() throws IOException {
+		for (String settingsResource : invalidXmlResources()) {
+			IllegalArgumentException actual = assertThrows(IllegalArgumentException.class, () -> FormatterProperties.fromXmlContent(List.of(ResourceHarness.getTestResource(settingsResource))));
+			assertThat(actual.getMessage()).startsWith("Failed to add preferences from XML:");
 		}
 	}
 

From eb7bf1a5d26b5f190946c603bdffb55ab02f9672 Mon Sep 17 00:00:00 2001
From: Tomas Bjerre <tomas.bjerre85@gmail.com>
Date: Wed, 11 Dec 2024 10:54:12 +0100
Subject: [PATCH 014/210] chore: changes

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

diff --git a/CHANGES.md b/CHANGES.md
index 9465f8afe4..2941d60e9d 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]
 ### Changed
-* TODO ([#](https://github.com/diffplug/spotless/pull/X))
+* Allow setting Eclipse XML config from a string, not only from files ([#2361](https://github.com/diffplug/spotless/pull/2361))
 * 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))

From 45420dcfb0ff07be6e598c5ecf48a7fbb325a833 Mon Sep 17 00:00:00 2001
From: Tomas Bjerre <tomas.bjerre85@gmail.com>
Date: Wed, 11 Dec 2024 11:01:52 +0100
Subject: [PATCH 015/210] chore: testing with configXml not properties

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

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
index 1ef433acd6..862f82010f 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java
@@ -48,7 +48,7 @@ void settingsWithXmlContent() throws IOException {
 				"repositories { mavenCentral() }",
 				"",
 				"spotless {",
-				"  java {  eclipse().configProperties(\"\"\"",
+				"  java {  eclipse().configXml(\"\"\"",
 				"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>",
 				"<profiles version=\"12\">",
 				"  <profile kind=\"CodeFormatterProfile\" name=\"Spotless\" version=\"12\">",

From 10258213c8201363b3a1b3cffd85935f98d2110f Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 16 Dec 2024 20:58:44 +0100
Subject: [PATCH 016/210] feat: add support for absolute binary path

---
 .../com/diffplug/spotless/java/IdeaStep.java  | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
index cfe8c5f349..0aa3612d65 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
@@ -26,6 +26,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import org.slf4j.Logger;
@@ -56,15 +57,15 @@ public static FormatterStep create(boolean withDefaults,
 	}
 
 	public static FormatterStep create(boolean withDefaults,
-			@Nullable String binaryPath, @Nullable String configPath) {
+			@Nullable String binaryPath, @Nullable String codeStyleSettingsPath) {
 		return FormatterStep.createLazy("IDEA",
-				() -> createState(withDefaults, binaryPath, configPath),
+				() -> createState(withDefaults, binaryPath, codeStyleSettingsPath),
 				state -> state);
 	}
 
 	private static State createState(boolean withDefaults,
-			@Nullable String binaryPath, @Nullable String configPath) {
-		return new State(withDefaults, binaryPath, configPath);
+			@Nullable String binaryPath, @Nullable String codeStyleSettingsPath) {
+		return new State(withDefaults, binaryPath, codeStyleSettingsPath);
 	}
 
 	private static class State
@@ -75,13 +76,13 @@ private static class State
 
 		private String binaryPath;
 		@Nullable
-		private String configPath;
+		private String codeStyleSettingsPath;
 		private boolean withDefaults;
 
 		private State(boolean withDefaults, @Nullable String binaryPath,
-				@Nullable String configPath) {
+				@Nullable String codeStyleSettingsPath) {
 			this.withDefaults = withDefaults;
-			this.configPath = configPath;
+			this.codeStyleSettingsPath = codeStyleSettingsPath;
 			this.binaryPath = Objects.requireNonNullElse(binaryPath, DEFAULT_IDEA);
 			resolveFullBinaryPathAndCheckVersion();
 		}
@@ -89,10 +90,11 @@ private State(boolean withDefaults, @Nullable String binaryPath,
 		private void resolveFullBinaryPathAndCheckVersion() {
 			var exe = ForeignExe
 					.nameAndVersion(this.binaryPath, "IntelliJ IDEA")
+					.pathToExe(pathToExe())
 					.versionRegex(Pattern.compile("(IntelliJ IDEA) .*"))
 					.fixCantFind(
 							"IDEA executable cannot be found on your machine, "
-									+ "please install it and put idea binary to PATH; or report the problem")
+									+ "please install it and put idea binary to PATH, provide a valid path to the executable or report the problem")
 					.fixWrongVersion("Provided binary is not IDEA, "
 							+ "please check it and fix the problem; or report the problem");
 			try {
@@ -105,6 +107,17 @@ private void resolveFullBinaryPathAndCheckVersion() {
 			}
 		}
 
+		@CheckForNull
+		private String pathToExe() {
+			if (binaryPath == null) {
+				throw new IllegalStateException("binaryPath is not set");
+			}
+			if (new File(binaryPath).exists()) {
+				return binaryPath;
+			}
+			return null; // search in PATH
+		}
+
 		@Override
 		public String applyWithFile(String unix, File file) throws Exception {
 			List<String> params = getParams(file);
@@ -126,9 +139,9 @@ private List<String> getParams(File file) {
 			if (withDefaults) {
 				builder.add("-allowDefaults");
 			}
-			if (configPath != null) {
+			if (codeStyleSettingsPath != null) {
 				builder.add("-s");
-				builder.add(configPath);
+				builder.add(codeStyleSettingsPath);
 			}
 			builder.add(file.toString());
 			return builder.build().collect(Collectors.toList());

From dc3b568c893d9cb774d2f495a808c2f6a28780f5 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 16 Dec 2024 21:07:01 +0100
Subject: [PATCH 017/210] fix: don't interact with the file directly

---
 .../com/diffplug/spotless/java/IdeaStep.java  | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
index 0aa3612d65..5c8a0597f1 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
@@ -36,6 +36,7 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ProcessRunner;
+import com.diffplug.spotless.ThrowingEx;
 
 public final class IdeaStep {
 
@@ -120,15 +121,21 @@ private String pathToExe() {
 
 		@Override
 		public String applyWithFile(String unix, File file) throws Exception {
-			List<String> params = getParams(file);
-
-			try (ProcessRunner runner = new ProcessRunner()) {
-				var result = runner.exec(params);
-
-				LOGGER.debug("command finished with stdout: {}",
-						result.assertExitZero(StandardCharsets.UTF_8));
-
-				return Files.readString(file.toPath());
+			// since we cannot directly work with the file, we need to write the unix string to a temporary file
+			File tempFile = File.createTempFile("spotless", file.getName());
+			try {
+				Files.write(tempFile.toPath(), unix.getBytes(StandardCharsets.UTF_8));
+				List<String> params = getParams(tempFile);
+
+				try (ProcessRunner runner = new ProcessRunner()) {
+					var result = runner.exec(params);
+					LOGGER.debug("command finished with stdout: {}",
+							result.assertExitZero(StandardCharsets.UTF_8));
+
+					return Files.readString(tempFile.toPath(), StandardCharsets.UTF_8);
+				}
+			} finally {
+				Files.delete(tempFile.toPath());
 			}
 		}
 
@@ -143,7 +150,7 @@ private List<String> getParams(File file) {
 				builder.add("-s");
 				builder.add(codeStyleSettingsPath);
 			}
-			builder.add(file.toString());
+			builder.add(ThrowingEx.get(file::getCanonicalPath));
 			return builder.build().collect(Collectors.toList());
 		}
 	}

From a9320dd26fa7930988c287b54badab76303a0ad4 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 16 Dec 2024 21:11:37 +0100
Subject: [PATCH 018/210] doc: add link to jetbrains documentation

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

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
index 5c8a0597f1..d069e721fb 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
@@ -140,6 +140,7 @@ public String applyWithFile(String unix, File file) throws Exception {
 		}
 
 		private List<String> getParams(File file) {
+			/* https://www.jetbrains.com/help/idea/command-line-formatter.html */
 			var builder = Stream.<String> builder();
 			builder.add(binaryPath);
 			builder.add("format");

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 019/210] 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 020/210] 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 021/210] 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 022/210] 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 023/210] 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 024/210] 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 025/210] 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 026/210] 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 027/210] 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 028/210] 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 029/210] 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 030/210] 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 031/210] 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 032/210] 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 033/210] 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 034/210] 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 035/210] 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 036/210] 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 037/210] 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 038/210] 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 039/210] 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 040/210] 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 041/210] 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 042/210] 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 043/210] 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 044/210] 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 045/210] 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 046/210] 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 047/210] 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 048/210] 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 049/210] 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 050/210] 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 051/210] 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 052/210] 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 053/210] 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 054/210] 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 055/210] 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/$%7Bproject.org%7D/$%7BrootProject.name%7D"
+						name projectExtArtifactId
+						description projectDescription
+						url "https://github.com/$%7BprojectOrg%7D/$%7BrootProjectName%7D"
 						scm {
-							url "https://github.com/$%7Bproject.org%7D/$%7BrootProject.name%7D"
-							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/$%7BprojectOrg%7D/$%7BrootProjectName%7D"
+							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 056/210] 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 057/210] 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 058/210] 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 059/210] 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 060/210] 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 061/210] 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 062/210] 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 063/210] 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 064/210] 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 065/210] 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 066/210] 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
zcmXV%Ra6`cvxO5Z$lx}3aCi6M?oM!bCpZ&qa2?#;f(LgPoZ#+m!6j&boByo)(og-+
zYgN^*s&7}fEx`25!_*O>gBqKvn~dOCN!``g&ecy%t0`n>G*p<qResKK@r<&JI$;io
zL^$urU2VfYs_rt;3BbZ`P5liB>;ir0B{<{sUU9M>#WqH4lTN!~PgB@D;`rIdQ#hRw
z?T|`wO^O=zovKDMVjuZHAeratT0Q-HK<<x`D52Q}fPq1FSv00k0PD?K4^u2TMU^C1
z6_c`U_;HiQfYbD+RVjZCAZilbAS%cS)_gj{x+KlJ43*>95;BTTtc%A5Bo>Z{jfiz&
z$W5u4#(O_eLYQDY_i&xqzVd#y&cR>MOQU@-w1GN((w{b+PM;=Y3ndBGVv|>|_=ZIC
zB^E2+XVovHYl%!I#}4)Pma4)hM2Ly6E;&R5LmOnMf-Qz43>#K*j*LSWoYxxIR5Csm
zuHXA8{`YgmqApC|BgY0wGwj-im6rmS^jrAbN8^PEIHj1WH#AVVuUA2HXj&Vm*QD^#
zWX8+sR14XM!@6HrfzFpcC$ZXlhjA{<j&htWjfGaev85i~biz8$-l_SWti*k=VribF
z$5tT2bV0Enm^KPu*O4UE>{oq5cs&VRBUX2VwX$fdjO~`3n~1})#Bxr5Vh%KwFov=k
zW;Jy5qsvC$lw>?*BsoPIo}YgJN>u)C^4Abbjx$NW@n5S8aN_T0BeAXWjz#dQ=3v*#
zRQrjH1%R&krxBrfITop};aQdE=ZRgLN%n%+^y5BOs|pO6lg|I3prX{gSgQuRK%177
zlE#t+nHbT~VS<a9G1I$ae1OvJ7z=E^h+;|2mra>O995imTaX&SCB&pgp`Izkg}-NV
zI%~Z42T+^_9-gw;yOI&!oZf=H(Cot~)w4^gX&q(zg`7ekm4un&?FuaJQKIrLF$<_%
zR;ok9K%L!NlTYgW8?uhX&TS?ojtu~oLm(`7iY<5Ci@V)7+gRHbb!o0OipVh)`vKW)
zp9OVL<C-BR?~l0D$2r@5wc^8dKH<f~i)VbZ+#t*yr<}(oN?zPwm_#j1V22A2$Kr<X
zYl&iBHi{0I+N)&Q!q;(=__W$KIP4&WKsv5BBnt{-+hGdmZuu@?P|<>DkaP@Sn!ZRa
zpfwY36ct~JlEsS7_Dr%e0UL8^zRSsSv3K)+n<BApL8n3{ZtWdD3Uh8n5NP%`im!;%
zvwJZV-qR!cv0f7?dKiWvD#pw>$b@Xq9*^-p|AFj(*#}L-%5Z}D@Zl%y2gokn7l;Zr
z3CK}pP8BDR1$L~R{R^BwKH~@v9m;O_$00a5MMXTe!u0FG^=2=_f-XZR!DQeQ`5S_$
zO>mOUF8Y-Wfl3P|Mk-VDsBp`X&=kMQl<>nt9$C)^A<4v@xtW>qn@`Z)`|gCedb?$A
z^S(N0{?3!oy|^tx0p&<-D62OWo$gVhEodpMi;O#DM7P>i6bnTf$_=~8)<qRwr%lSg
z$YHAWlx%GOEW%$Xz?+5@;UP>PdQ+^h30pu>DfM=<dt<iZF%Wd^iWnodg_bpjHzj1u
zmR{hdP_rAyD&KsW!qfkGd$vNg6yHEfe4=W}te}}N@=8`h6e_MFzveJ3ghz-#0OGhO
z2<<C3kev<|JesXy2Z-Dk<BOW6PdtF}zX6|br%(j-jz@k^vt<ur%-RA>LQT20!&5)=
zGdR6}f=YHb45NFG9?dd44$Dm~B6k3w1%E%atidmZ`Kaw4q&8yb+5=wq<W&~!+gPDq
zH&}X5xRB%0YU^5G1!2~PjahmU5TsT52sk#OntOj}+d}$g><d0I3g%un8;N|V-#s03
zL=Yds%rWlp;Jp7k+phk%ZddABAJ5B$H+C)E3U~=KZNgUEx@Q3V&TOx;%#Qj6k28J2
zl?>e`pXWH0J%);cCo710p3&(EMuAI{aKjT^Z!u)Eq~b?HpnrSE9ftF4Ibs#HFpuPR
zyT$g5JIX12nSw?q!}IY^iHMikUh8V)gjx{JN@8Am6<$2Mz<aZI@TsvrH%cQ~(nRC$
zt=<W=isgz-M(s$~7{A*s_J_lmA`Or4_qGjHDc$H5J^#x&i^8tY`jAOnXOJo|5bblA
zesZ*TPfQe`IR#0B_!rSOGv+iOH33cL&x<-OU%gc{E@==rGVuPBO`#c;QFq2;QH=8v
zfmp)LAhZ3_k<g`I?t|Or+vC#-%6GMO6YoENpK{JLnnwOmo2JbpX&Gy3R9@(6LHE0N
zmNO5M;dW}+;2+?awOh+ha6tvEKHTFPw0LbNk;(eZ_IR~+(%TX^!&Avo1iS4kTldl2
zb5y-QTpX$Lmo1@q{oH391>^mHY*_n$LNj)%w6Vs2|Kwpq;J=(VFf`y)>|;A@J@8mL
zpw=k%oRd`%OdUL*1^Bd27^<|sYM9NqMxOfyc56FSDcG3u;oJKCAOsBvw)JlyBt5jT
zQZ;fkKI1}9MJMtnCEG?ZUph^R-lV{%Av1S91fH#pacM-EI@93$Z)d@UUxu6ru<qGB
z_;~0&UR8Oa{oB7NyMN8mw2Ys0k`?o`5D-Kq&&v+96RRq&qE+`BQh9I=c$Hd<MA+uV
zklt|&6gDTid^fGt*aD4b`C<u}9wU(~`9l@Awv8-Pb=;BBc3cF}b`d3(N-dFwftlm|
z)<9j>JMHVl=>YjT8reRi0SjW8t!4qJkSw2EWvi_K<HH&CnqIxcy15Aova;!CRXl58
zyy6+c3u+GkK;74O=vJXHuNNekO8tCZj4))mQaq8gkjN(B6cqYLX<YXEq{_`!GsLOQ
z3Tdt9Sr<PRCyvA8%@6^}8u(1eAIV*~r09l$(m{bIdN3Hi#@5{T=w)nm;yoKt$F~sR
zAANP{yoHRK8jQ4W5wj;GafxTtpU*lrvOTLTJv9Ns@lM+DyaTMb+%+?*jJ&8&=cclU
zF#?$9xUNoOKnVM7nOZm(hDKcQ(l&u|cdMp3hJAcRASIK3&r@z+fe5Q-82Q2k|M)ly
zJ6yjlibszENFezsy#9>%!>35@JDfw9#W$~G@9?4ubk&}M9<~>f3`r6~|Hun&D&#w^
zZ2xrK!I3O(3uNXz*JhWWdgESs3jPCOS_W_J;0ggAduavgNUuLi`PfS*0$=1$q$C-#
z>ca0l=Pm+p<gz_t)P>9&+rJQNFKvb%8vn0!qW9SGnIO&tjv!kv980`FquGKa<w&Y3
z)5JndS%D2(z4?UCnUa#lf?@)Y<?jk5r%Gk{?UmJ)$`Qyct&^>n<v;1NIQN1TQ(gIr
z0&hZ$g`Yp&{X$Q77aCUC4fxRx0XqS%6?FatTy|Z$=XEUb_WV6U`H*$Z3igU4SzEey
zu~AhbJ1oVsLkE?FizlkCjvabPczTY<STV;!)(;VMNR-2&mDoz?w|Azrd7k3u5|ukw
zvUF*YRtpB2_#%(n&DE>hc(YAwQTGx)(9c1fRnojjxST~<*=y|?<R^$NB<<1rj@4iF
z*9r;AkVvXOnj_Lwcjg>=9V1w`t~7Ag$5h)P#FwB7FM=E`e^youj?Nh^d}|GOC7mPW
z_H&16WtD5M9H)i@@=Vzo^f`%yIQZ-qGuCko?CP8h^B$X|UkaKazJe>9C00F82u$Iz
zFOjPU5)>;*KBg9UezT$OL$aW(Ogut^COwjSO2!@-ZbW#lHVfb_k?7DlEGcbl^tn{p
z#+go${sx^TPB3R527<rLT^t4ypz0EbhEfBf83w3L2_&>2wadT(x2lACj6Y4~LktAm
z<+#pEqlksdo%9?Q29%rP9C+LM*WZM-N-e*wX85OOu}J7Zrt%9iGjxN358Fy5GGaNA
zlr-b*b{4zqiK)A~_jjEnJhRaVOdID52{6I%oS^X6)EYS(>ZE6NKd-S?F}lIJNYkBz
zX=;apb)xyAi#nMFCj#Ex($CGiR?oF|gei))16?8E-mB*}o2=$UtMDZxq+&Q?liP(n
z&Ni8pBpgnCai7%!7$wG2n4{^JeW)f-h&_$4648~!d7<~p8apf5f~7e0n$lV_qbrLM
zH6T|df(D0@=>WA5f5yN)2BIZFqObOK5I*vhD*2~PZSt*83>fM))aLjXIEokDF;KGw
zZ_75?2$lhYW)I_!@r8QpYKr4p27lOeG~ESg#8)LE@pH;oozO*hv19;A7iT#2eow_h
z8?gZtDstc~s|f{hFXH|~d~zQ~z_94FB&hp$n~Uv_DB!2y<6&VqZs>-fmUU^yuJGdJ
zNCHP?2Q+FZr?J{^_M3`92rOWnrL2vymWZ&0dYxz>Kv&GXWgwxTKz)<+J43r&!q}II
z1DmfLl8nu-xGa?TgsrX45d}j{QAC!m8iO1JU=|Pb8D@9FE-V0hJEA?F)srec5$GqD
z8(`^KQozt$N;6ts8^+R_uiy|d8MO=#Jvd3z_#2aHXjF94XkEdq3myI_UvT|r>1&LP
zU*Mm7Fk}T$qbutLyH`@m{L57Mlkq!hAMe>2-o(8*axogLh^<?#hC=75g{W^TZF9hV
z)61H>b!!{|amH_{Hrdu!4kWol?jSB%l2>w;Jry$!mf_nbz9_B1#8bWJwL@w!No42F
zZ!YAr(^WO;wuxHb`%ZD(qK<WK!*MHJ{VL#P>IOW&)L%j)eAUf-WERo1D?D~FV`np(
z5x$@RPj8}2Rbm<>mRjfuPFJ`nN>>ltyp;oE9#K9I<eE2c_+cEmZ|}we15^eVMOca8
zOs^Kja&5G(Y3;%jv35=F>U>+pE$;Cq!IYr!NXvc_-MDFXBXW=Z9LZM(k9}OKqEKn5
zMk4%l_POO{UM$2M+YvQV#N~$?Ycqe>LbTz9ur0(-Wp!^8a^GDh7h{U~8h980RG|9E
z6RPnEU0ccY1fEIdJfnZ?3Nl4X0Ag>*m6>|oajhbexf9~a8(K`2Ys~o)z{jnuOj93V
zg4L4K@x2Dewt5Bok=03M@JIhBSWy2hwxcxRv7ukj`8uYPGrMdH0q!`qHJ^xDQ_bLG
ze*?ZCvMv^t`JI7rlqLPEo^WJ0b^>d@C~mI!Zv)-ljBg#u;uvw%ZXMqZsz8Mxdtvbh
zbK^eGn90ynsgjzKUOl)<k<4#6R3(K)zV)*K=J(8UhjW~IcI&*cr!{O+WX^o)<#_cE
zh=i3FDhL9yPcRn>O`l3#-uY%L?tj;+Edgz+awV<usc|DqwYd;zT>132>9Z-?mj*}u
ziM4~P{Pc$s;}v&zYF)Te5J7W2!$o`EH|~F3NfA2NjF&~?@K5S*f_mv2@wT};{Sj`b
z%#^~iJN17>qQ6aej~{ubsrhkBAD`C(j7{y)+hU@!^SU03F0Vu6vU3+>!lN@MLR}42
zLOtG<ZE~qfBnNcb9}T(GJ(fs6FH=m$D;xX`+6FOfP9@%6jy^qSFzILN>S+@f@~=id
z8&aK=-2+Pz*y)te)kF3xgyS?qgp@L;G(tM1&#!4p&Z$yX2<+lj>VWT1tiO4`_h^}*
zQ@WGd`H9t~sH>+NT2d{O5(~BeYjG#5=s&k0J)iACkpC8u;rFz@_E-w@s0bAs_;b>+
zeR6?5n@}4wjy}GSL@%#%!-~chg|$Q=CE38#Hj0u5P4^Y-V?j(=38#%L#%l4={T(Rq
z=x*H|^!EG)+e-leqrbec5?(g)@Op(cHsVg4*>F$Xb=B<Mj9i!OJf(gHeKzQm5F_*Q
z2HB(w_OGM*8I@Oiv=T*SE;gaYd!f==Mcj8;{^*ii&1a9eyfa86-a+HVGmC5_p_km2
z&Fb`{K%~ciBDz($MTKJdt-cTgB?=B6U^IkW4f<S$(a+jRT*h%d=RAL(b|1Oga!1}}
ze=0z<%Hubc9hq=4crNO7k`lr~1{2r~gN8`cxhTdH{$L|R-ENncLqfw5f8c<&5|!`1
z@6-eme({Mm)dlHqs;hn1{~pYa%fEjM?BkP|*>heCE*5LdSmdwZ-MSJs@@i{5t){y;
zxAVyon;`>Rns;YH^`c&M3QdxzNaJl(Byct8a9v38fkXaJ_<=8oe=(6%mZ}CJAQ}2r
z#oHZ)q;H0pGydy~@02e)oeVW*rQaD_OLr+)29*|p(gAHd<9*JxBnu0W61lNr+cO_=
zX$B`VmPwyz9?FV9j3-@v0D<tzqo)8jV6Wb<=%`8RDyhXV2!7Q+Y?1{kDTLBUSm61w
z=&ovZ4Tl3rA*k<@^91HxsHF?kmG)PfHk6m*q>7Z1Z}O;#KZ!@Gm7ZeKORcLQsPN8=
zAZRd8VWqow?b1Kp8!AiYk8acC$>6xHuUZWkNk~?EqKsUr2$iixV=zYwM9laPwn)(W
z7b-$PlwKh6n5^&Rs$#s&98P1ch#7FGNN6yU!Nwzcesp2Ylw~C1F@G^YA!PF|a$MJ+
z{<m@v(4|q^LvrVi0ydAjvRhtXkA_)46s4O#`ulfgzLw*)cGDV2<f#8~<gWfLWxdtV
z=8S7NK~EU$LhsNgEH*@PVf!36{m_}TSD~@Ceh-q=-{9pAzqHrRCr5_tNt?#Ba`+we
z7&bV<bduD>!r?468ju$sWQLL=o~SYP|CBJ7(3`;c^t;TL4ScL$Pvv>N+5iugRLdmL
zaD(CzY&3J+N)7MS)Jw`U8u*IevtEAUKN4~AiL82B$4Bl5oK#No3jGEW-o4`>c%G#8
z!h<$iX*efTk1lnM-d*7Db6h_94Y@IcQg@UJ1-g76_d9@vHWB%F55WG&!4DAy{K)Xv
zz~7iiiq(J#G*Jdb2F>RKFnc3y>bIwlQ_Jhzoc4h(EOVm|0C}@X1v`lf-*wuaH5_<D
zN!M1D+wH-t4<u?HMdA879=B2t@_)6cuR)c##-iwU+RjbSxOW`u*x}v#{I;pYJI|!J
z+GvJ1%z_X|5*f2zt|&=J6fNdmL0&-<j98xr7=t(FYmOev8S+Ni<Uqm~jwowjXVyxN
zJWetFubZ*wUAI8SJim^*rlhaN#<~-n9)=1k$Qs1zhTW{i3iN2?*g@bOqF7eze2__U
z!6wdI=Y()&19xI)>H)kg%$_&tAkc`-Mk_04t+f0A_7=y20O8`7#X)4WDMOUpG*Z~n
ziH5Zevf@*c28LS>z60h(QH92FxJHOKTj&>ep>z##ag+Tm*{QU<#Sk`f3)1y<#hgNV
zkGRx3`qggo)?FK!Vd`6U+lA@MVk3QlsjDj#M*^!8JsEqK;p+%l%NyiKg#EX^3GBuk
zlh2;u`5~mtZgY!005*{*dmF!OsrxVg*Rpvf{ieqF1ZPV6Mm4vb&^x06M8jn4XO#a*
zXJhi$qNRT@M;;!sLq`lbqmcnAsSvSakQ{XcfmP-CU5_ini_P>t3m1P+(5I3tq028F
zE8xAnu-M!FQ{&(q8oC{RXMCqw5&ri5tvt$=P|_J!<S}+D%O^Ku3l#VU^Bs2C?CSjD
z!u@>+#m6Iz;U2BaX7}7%E%i{`jgjM^OfP1@K6wN+iSJ-2z7%MfLBS2$+zC|(5j4tu
zq@N1d5n}UyXF>Bz{_%qT2O=&{@hkb|g++>5oZPMe%j~Ee^;OCr)Y7u{V4m&Qf@%WD
zEUKEu%teX>pmF5DMIP1<d`_a^o0v`h;r&H9&46g$nZ<4Cc58UVE!wl3&1UK``%}^n
zs#Zj6;EKRJa6T>!>pm1D);32{D-N5>U4W*9kTO|z(Tb#n-@+j!vWj-S8aRy<(xvQm
zwZ-#hyB%RQf|G(r&oI7iZhf^pG13lCEWA>mk}rI8IFlm%*!~#7;2xQps>NS2$f@g2
z1EoM!1ML(HjM)=bp<T>>Z>u=jEM5{Ir>yFJ{m8hLv-$1jxB4a{4HNUhk+Rj5-H8}G
za~r&Uoh}bQzyC)f6#o<NF@`zA;2YupMb7i9uP9`V&Ic5MjvIrX^e7n`5tNM2*&(=r
zcBW(162N{VdWZg4iIgmf4f-xR=H0@4UBnIfwaM>3mEkwFNhaD8_~{CW03Dv2Tbl4{
zAFamTS$i&ZYWmae1aCxVNIKrj+u4g3%D96}iqw8~HBu+gFA&*oRP5Z`MikjjDgYjq
zkf0&#_Xj->@bJ><aI-$0*PLQuc(&H(7C*+_g{jVZA)X`Q&U_8!UE*2H1T*_S|F5$J
ziXJm4bSBrBu)!Q~5f3`*a53rdG{a8qb$3a~`~72V%$H!fi5J(xEU8S>!}JGl=t1|~
zGIx9!u63fRtm^?=^0z=^H2SZA43p1deVixbphteFyrqycaRq6DLy2$x4nxgB;-Dug
zzoN<>vK7~UxLPDR{wE0ps6mN9MKC>dWM{~@#F)ne0*ExL**#VrA^|@km1xCtF`2N(
ze{G#meS3J5(rIs2)mwi>518)j5=wQ+Q`|O{br)MyktYd}-u+5QYQmrBU2ckYE7#Z$
z>MgHjknqi-2`)(Z+pJ?ah4UMg*D%PFgHFMnKg?{GSZZ*f<zs(2P3*mv05gRY3f;VZ
zH42XQlv-7u`8^6-{<L4wfN(KAOlA`&j>3V+g@129FH@79v%&$&v32_So*G$-3SIp6
zYTlLgF2}s>)U;QtdWf5P&xikI0p1eg2{G!w0+xXNuYf%n#X#fou<STp^-T+QP2D;y
z#0HJCu2=Qt=mvDi;%fD~{f1VD-v}qDs5zM<j>8}EYvAw$zmrjK&OZkS!$REMr$*aG
zyPPjsYd_SXp#Vt9NGI*R;-*4~Gz)&7!zq>hh7)i?8PzCAAv(pNcUGlPNf^OXS<esa
zQ<{y$w(c0U3<hbHk+iWpcl7(__cRea6BTne)!t6TB`3@3uN(fv!bJ+R35}v#lY*!+
zk1c8QYTG+S7#;<}0Yk(kycEC7h*N}A@+9IDkjme|(09U;3>$=bx(V#ji2eMF6q{U@
z9?ldp%YEsl;)d%}_Qs81OX>!2>kyChh!-n0Xd@2C1cI2qkRk&b4)(?@KY|?%qMoYb
zEi7l}n$O`v+T31;YZF(;FEwj`I8Dz*9fbKrE)8#&?joolVY~3YbZuJwfRt4-kCOM;
zcm34HXKH>;a?joGLqjIBG|B??@rS`LSU(l!vxSyfKmGa^x5&S$gvrsrlVT0@Yw#bP
z-3#zdbm1;n!DpT@>An<WN40~YDd1&uYv4oW6ka&<3Nv$70Zrxf1F9twp8ktp!suvZ
z*~bqbCL!B&B#>xkZ4llVa;h^fj?R3uN5?-F)SLb}a%TBE=HM5_U*{K=ddu;L7kJ##
zqyyGh;WY5rpvMm)$*xZHv!CUlc{zU8huQp`KmQT*yq*ugOu_#Kt-kRa+ODx`Va(;{
zLMO*lsSV`U%+u>-R9GmwqgWulP#>jO9|<YJVqD#QVLRDLG-z!-T2if+A3S9b{=p~d
zxzlZ!Q)Zwi(&xM+98Wxh#%rY|zug*yF^fukbAdvj#(a~ea9h$~8XfTJ&I^>V60TBE
z5ONjntHY2V_MmDJHr3CyuL<p*g6$AjWNnQJ&GscZgWq{EsV*%hds#Fmjpj-MxRdN0
zZL_c!Q+Qg?fwTm$8pYCpSOx+B*c8L=DW&*Nac!hO;^^n?bIb_te*RJ-?TF3$oJQIn
zL?mj4(e_Rth;5+g9~eTO;g`BKJsr+SP@K4sAm)s&4xG>5X%IlQKbDRch~>EBrwAM?
zvOJj&z#NzlWa*K*VEZgjP#cAQ-H<t~$O4)Xv+Dn@4zkOQ2m>R<SeNg{mcBHu?zxw`
z?TABihSI^x%xa8DdC74=aJ<5j`4VSZ$vzpQ6Ar6wdVdb-`j8>G&mC)aqyjY19GP$U
zSKm`d_gXzrLE_^a!9R<~vT9n;>{y3F`!rB%M5psN(yv*%*}F{akxIj9`XBf6jg8a|
z^a*Bnpt%;w7P)rXQ8ZkhEt)_RlV=QxL5Ub(IPe9H%T>p<I%Pv9HSt_N&~dQFyc2i4
z*{q@;(<#tCjMnuB^SURG&^7w&cO1q$8&mh6L5WAG>hrx_UNUT(Tx_Ku09G2}!K($6
zk&bmp@^oUdf8qZpAqrEe`R@M|WEk$lzm$X=&;cRF7^D#Nd;~}a8z$(h7q%A88yb=#
zVd1n3r|vPZuhe!9QR*ZtnjELX5i*NoXH%d1E1O1wmebT~HX0F~DbFxk=J^<<mSMS&
zX~x>v|BCiebRdAHYXxOo$YS#BHYecz?S6CX@AcF_k;#_IF+JIV*5|%lV=Y;Ql?=b^
zt}1qN)~qaKnz~KZRf9Aa7U5S&Opz~;SF2ojOSD3HP8WYTbvlEyYK~);#wr+UO8_Sl
z$-Yx3B~JYU!uChjzf0v1TKYAtsRkH`QZeF8Q$_`7iPJ79{8V(jbX4T=-LF59vw>au
zY6LS|t<r<VnsVIQ&s;WeY$v#8^*ZzqQbiPVrQ7z9WyBJ8wn2s>!~Zz>*ops1&9o5w
z3lQx<X86->+lhgdg^4d0r-%q!s(A$J%XYhUx~)v|ptx_cU#?44pnz*s$G%3=wh_01
z5l7f$uM;P6oqhM8F|$4h0me5--syUE%vI)HuhLv@kL`s1eP@buw&}80Umf5QOXBlP
zAY(8r9}paD1p*&Bir^3<@3Cc4Mr>EpoDHghr{U$hcD8$^OZ6bZS{UYhl_*Otp}Be}
z-P^9U7tc!@aodKCp{~TV6o}?M9xG$hN$Kr>|7e~E4mJK>_yjrqF@Kk1;fHw1PP`UI
z1Aoa$7yGRMrUVO0M9$rM;=Glzi>SO8!lqon9E_1^0b)CsR0%Nv-$st+be?a*qJkqI
zUNaqi*6Y^E>qlHH+*M=aj?)y2r>RGkG?X;Rv!7J<xSTYml}L_#*RR)+pg$b0oA9un
zo)O8yUD1vrV;CN61c<>G6Uz=^g7B`jEKEvgUq)s3Fw|zFMdak((XwlUaSRN4hGMrH
zn2xFaLH!t8txnTiQW;qUWd^m#<3zgCp(=5~i~xw9lU{R~o1qSo#Sh1_4W5(^hL%O9
zOauMH!uGL}u?hV!4V~#<c9qg6F0qxzvx=3D6+G|k8;iL8S`0fe=c@jIF2QN;HVN+L
zB8pb93U$en7x_kB_Ei6fSwz7l$cl<Rkbl7k#84KK1w(3TGvO>?F-<;)X<)4B$u1F4
zf=%}>{b#f`$<Mqx@^7UjaX9O&DqaNU1sV|xyPH70-`g8GQqh_7t~PKl{WGSV!-nI&
z5x^WkB^}j8!}L|E{Bv;`{kkp1KK|NWSTnA_T(FrcNt?CCIH{5Ynx)Hvva<Yi|Murs
zP_)yQ4x5DOv^6;`UMC`h%}P860Guy{0ER~1pYzMGp=j(@7ArOh^!a{EpW}TPYiA_l
z<{x`F9%Bk{k|nUza{FT^$G4~6>Ixo^Du_42V6Wir?Muh`(!izQSV9Y3d-MCQT|9bs
zIlCtJP7*;A%^1-=u(Laj97hG}uP6Hq0+DzAjB^|$CG(?e_adMTiO&^_9WwrW4H!ju
zWEYrjLw<{fSyh-yiPOP{O;c|453fxkp`E;k&)d^wYK=ipbD_kG$u*Ro!kQJOppV5*
zP4o#ab%r@RITbag_zHMKF5$z8fJd1L+D8G@m^`*H-><XW&!E2O*7MC?!{pUUn%wZ0
zrjdgM1OEvuEnjXiuI=?DUs_SGdd|2DO>XyF$E{x;d;A+T`A<t@;F&eq=W$ZFxBrBV
zBqrme_MfPkBmOrU8Dn5WSOqX4W!$tNzYlZR%Zn7##ZrayUxXE{zRlXwa=Kd0!jDsr
zf4YL-hi@HhvV*m%F!0&Af$zMNs(PRNhy^LRr+D8I-2$y{wRi=-oDS!GRD@c1-#lJ#
z?Cb1gSDw2npihN2`Sal|o|%oZY5h|#@0msZK@umog@e0;xZgufBsJ%42ZcnS+^HX>
z<K{c+<VKnbt`hUxZEbqOyb`*!E5D}Flprt{afEqT7(YyOvjxFg`Ntw&2EV1Q_xFEU
zaMawsUM+q6XCRuVk;HDXDNbTE<cJq;m$#2%XWCL-l*f(#(dy9EWEPhCL-j}ycUk#j
z*RNSEZpPU%&aEO&24(M{T6EO`ky;APr0hsmA~5-ZGg>R!1#O!ed)ai|TF054f1+K6
zTDH=fps}vL7=Yl3_R)o948I{CP*`f1v{E~-xX#PaLvb?#qQRElOF-pVuL>d8_&#0{
zSCu|?z-R)71@L#eM!y^Z6p;ZjzlW@gZzHJC3~O?Pk5QEa0q(aFy!-~pFZ%vBM{a0B
zOf<zFDgb$X4e$}V7x#N5F5SD(a{p`WV{ovV0bb4!FgRyRA>AZFmYc{!vg!PSF@l2U
zJK`=N@CTmAO4Wuqv6k{SNl?~rs-CcW0VFIdAj^B2Wacs>M@<wo1?4aI64ViehhHsW
zAUj6yS4-rN8cL+-MvV%PA|utXAn$REhv6+@4T|`dxoS7l8mV#f-CDCLyJAa}1^-df
z5SQ};kJ4CC##-gVCyL0NH*1Fyhjam2n$5I&nr5_a>3N&63=c06V6Rf2sR|QLucLaU
zKEq5=F9zA=+3ZT|OlY$lIrFmvTV4H!iv+MxhtKJ%j}wlD3qAoT@g^}Cw`#0dsQnXX
zETbS9p{IGl{fkz7ld(7^$~HEkkh7pv3NYi8<1qwOw!a|xaQ$TntGU7;01Z4?b9D8N
zBh&aOYgatY!f;X<$(oO>v=8iOcEG%aUvS8Uu1du6!YK*G&VLOXlHRCKu=FF(IkNo_
z!128k!z=B?9(@872S5v{*=6WjNH3gAJAUYkC%^7Y;H4r>$kZZC%?&3E-qa#4n-YG$
z{5tlV`bCK=X~Idzr7&v8p)y!whKx;pP;V!X^4&igR1g*2j}8HyVC+>KqbPFthf}+i
z5*V2^NBvmwfWIU)3;IBGEwFtYFWVWUoB2RyvL7S*E#d%FT_ytxM895Q4V_PCQh+><
zlu~L{SuQcQ?il+AeFdE87H!P8>HgIJjkGW8@`{o5wNd6uVn=dNX5$aDi14$pTSR=`
z!YTmifM=Cy`Z=%xX-u&9>1bJBw3nKr0@mO&<l+TM{hJ>YfAp~^V^fzVJyvwMY(hM5
z=T^FaQL~&c{7f<wuV`~sK_KLh@eGlVHvH7HREDQ97dDe5T~F|au^qLp<0$Fl8^Zr4
zq*D&BSb={+vh(RbAt4qJ03}SwL%-mJO#vNOfsT%zrxYk^?BL4i$B@tPym&b9eFt1^
zO2f)Y91tAIJ28J0d<we%4eEUKt?uq^582L>IT@FE@vI;GbS=Go0=v=3x<1AaB@b>U
z;-hwvu#U||CUj!>9G3YgO6yQX+H)L6*ozXXaV=U_b`_DQWq#`f$?cZ;??y9(AcTLq
zHrc9U_$w&NRKgWZ>e};_T#tf-g1TX#Ttj{JjKjCJqlf63U8$=~02ty9Nn<E<Cyz9x
z)R9Y|BUM1ApbuuO;Tr4`Qu4ujP})2wZf}V70WS*Y-F&%WLSp&!fP>3p2WX;CqqYS%
zz5QZEArIj!d6Y0VI^JFWKudu=NFUPF=6TxRR|reQB5_2vIn)qBV}S3;MX1}04E3Mt
z#5d$zK8z>OW^i7tXPB6e%UCqcK(le)>M}pUp6H17YHZ$`4urRAwERt6^`Bj>zwymc
z6H+f|4zhQjlg1Gy%93Sw`uMScxrA;vQE~ta!zM?jz@&c;IxYkrPHXB+h4)S0@SIgF
zdm{UTZqxJaxzBR!!`71;K*uco18U~X>AK&Pu-C&`R?B-Aj0=_$cxPzn{MlJK>ywJq
zsw-Yj{^>7%vDCYw^iw(od$~o-Pz6ks8aQ}A1JFWnE@Ez_SYh@cOMFVY`?D$Y&Z~a1
zd&GTzg|c6+o8_xSfEUIvTsdiN&WOe=n|xS;8X;CYLvf)|=u($Yt<h<O){z%>Ou_6J
z0tW_ukuKXj2f=f}eva;=T4k7`&zTqf{?>lGm&{Fe_;9R2b^^i}Krru0>ta|4^_A$H
z7DO?PFho!p<t1h0o<lp}=TX|0u{hgSUb6BokyqC>4A2C|$W~JYbWN&eW(4R;;Tmhz
zkr;EbZ4D?Birca@{afZpp_|p2YAInGJ`1Fkz7A$droV0#{h=lZdX+xO4B%I?B_3ac
z=7FC<vao7w{^76u(1+qZSECo$h1pU(P{5D6ty>kf`P*_R`SaCnBPG1Jd|Abx!brVL
zIt?Rv1@qnIGKpG7W-M54@Oi;BujL}Xdacfmc_9q?u&4#P2hPg`({??ZOOjRFnps_D
z-f(IqU)UUW`f&U}`A@568jBEz<~CX~Yv+1et@-+dsV3RVrNTx?H9ht?VAAS0D1{G?
zJbr4_B_Tqy_Ag;Xppzr)KXQ9QX}21eoMW|m_{|BBHJ*=OjhvNq(4HgLp`u-X3tw>X
z9A?^?H5zIU4r9K*QM+{?cdUL9B5b=rk!&F@Nffz-w_pG9&x+7;!Am0;Llsa02xfYC
z*PtggCwO@a;vLXCgarLHOaCqh;)QBGzd)|oeVtn=&wvyz)rOR3B)bLn=ZqpwZHq0G
z#6YvZtco3reVEzgsfMR6A16B&XJA|n?MuIu8bp_){SA_{zu;H?8<Hoj+YrcNwzl45
zynPmOqX0zDq;9dy5xgg6eBT{A6<^}^RZb#xBhd4Vxl3^&vJ8dSE<6UJ%3uCR2%e}^
zaNc1cB%&_=$n4q|jDW9LisI_Bwoe}~;3;AThsohJE5r{ZwVGt_I*nAasZTu{?Pc;S
z|0cWz<?<J}ZI1+zX?Z#X`5u#6ab0%#a0<qQE-pTvnHg>${rR&r^T3v9C(nb5F3yeC
zBCfU1>1a`bLUbS{A0x;?CCtvBD58$7u3>y2A_P<b?b$MBTdJ{GC)Nnl`LyKG_*Hop
z9lg0)0$>9vigNVLI2|Lin+b~C-EytjMOHW0NTui}pkxXdFdIJ$-J+Bm$%CN%mac~u
zc65u)RMsVt!-|8Ysv6BvqDBlFKElp~B6L!lpd@XpeV9f#ZPtB*A?b!2cQ>(0KpkD3
zcX2g{WebJL!6EmdE>s!+V>?WUff2Qb1G0)SgHlNwmhKjxqoM~UZ>S=G#3}dZqbOgm
zLQr$%IH~rG-VibZjQxA+wx_MOF@JC7m(z5WFp@?e-&dnA^W!f5(1q_mx7SHG&7Mjz
zJ*FkzBLiO~YXM}_WN$-^LB=)#9j0}Ig(60{oTJ7L{`hY&|LX}pO<rT+|G*9Gf8a()
zOc~@n$A%+pwZYN;A*6cm#eAnEr1ayEgf1qlgsiMYz837C8965n=QwPBWn+vN^1o5S
zo>&lXsa+ZJY)@FOggOhohsSKci~64T#~a*U>?#ib&8;moQD4mX2U+S(Fg|)$9R86W
zITbI3PGBmng{xAMx7@wkfPyHgTBnY--U-MN(8g4;hg*?%-H-2y9+fMsROmUruu~DJ
zD`y+zHt;&kEmb0pX<MKk9VeHzIKFG@)kXA-6x*e8YXX=EG&)H)LXrcR*35lg5K6?+
zlpgs)C!z03;6L3-C)<NlGDA`MyU(j}{a4Dl13elcAiBf<7wo7OVQ1_&dLFbxpf+fi
z{v;-ON6qh4_w!Buw@b&@)CVPDFK0(&dXB!y`%}`87whx<QMLyII#VOI#?|-f9<QBU
zacq><5f>5axt7b!mHhGZrk)cPJl8fFV}4Hof{DHc?nmlNe4OZlh%Hw~gDORC9fFH@
z(dp|iOIbEM2+*ogN5G5IIj5N6dcX2{rbl=|y=_lReUu(wdD=vfPY1!pN@X;H)!7M&
zsVSTH?G;8EjqWqJgt8F<T>#raa9{%Ig46>|d7k@)*edY9u$q-2MD_g(YtesUb(fF@
zeIca^`q$v%I*l@1*pSA^WwV15>IOc#+Fmv<?fsgpu^Kx3J`#R~YS8+9AP9ZC2%`%P
zF`-q_w(>`%pKtg3<1=cn#Ja|#i_eqW9ZRn2w?3Zu_&o>0hrKEWdq=wCF&fL1pI33H
z5NrC$5!#iQpC~<a0scbNdu?P(QtIkCpkta4+IX@92<1%sjPtvPX$(f7^k`k;viMi4
zGDq^Wq?|OP{&)nL5VfRRj=-&8b({DfVdIY(JXO;_3=;9;+@L34WjrTXgnv|ShZy8S
zn)kl2)cLW+)Ya5+mr<919TL0KfAOPW^5EX<RMpJV%&D(fMAM2ZnBGP<3uH4?fjs?c
z1#I@Di7*A!^O^Pp=+-ZD-_J$)-{;JUGncaOj2MXxP&0t~x_T)J2;t5M?rzKuubhi1
z)ctYdn(7!8I?JbTtc@Xp%l78@FUY4VmSsRQ39v>h3&=-FwKV0nX1y6cWqW7`fBi39
zRr%M}*B_mXH{5;YJwIOwK9T9bU^f*OUt#~R;<BY?Gvoe+h7<-uF3JcwFA)XBYN$ES
zY2&=H*#2I0SCA*7(@a<>VnR}qpl2)y`p76Dk90bpUnmP%jt$sr^*lRURZhg{Jc|t%
zzJ@`+8sVJPXQ1iJ<*|KHnVaNh6Bw9w7(H5d@A2z)pFDaQHfA+~;ft*Wl5TXgXt$X+
zw>HuHuNiPuH}l);i?tm23b}z`d*)Fc#9aSTR0**x64KPFxH=waD^aF`<3*U+;u(Jl
z%Vml|ibUgNPW@Mu(3F&xqqX`Ywa;f)vz@_@ai=KchFb+T#v=)>bVeCp(|;s8%<x{K
z1+gE;eojqo{p}lEKqy;wChO!^*h%eEOKb5YUw7d5u_fLZ(~;C~X6+BCg~O#75!y~9
z-H)#h{UBi#^5C<w*R5gX=!nQT%QnJx3?D~H1=W0oh5KXibBxVm4w0BtjT~PD?r%?u
zYNdoQ{j(EB_`3-l_lXRkO8QT>R{-yG(vI#MB|PpTf%;Q_dytxihYgUEEp*4UnBD2i
zFzwhlAsbs^rvyOn1@$Y4a#xL*#mfe*-%9pKM;rMxBrQ{x6g=Z)-ac6r2QHFaIB3Cb
z)MlIq>|a&HnWt;JF7aNioc_56#kOM7`*3HQOh2zj587o#jVvMmd0^Lq^}+G*kE4L@
zyr1bonUrLt{25*}164@vq<IF=>#vyAHWXa=#coq+BP`G?NvJ{D6iI(?WK_#=?Sghj
z1PAobWSn&T1J<yFJz2T@``FrALWxKS9H{AyqTRHIDHy0u)-h56#Q#pAJ^20|=V!Zy
zxH)>N2+aDKWLzLa-vkU}op+rSMu-^54o|YB$BNlXsc4)Pk+N;1Zjv_2G@*gdMul2v
zus9!wq9-nM_j*C2j*4}T#EOpQH+mG;>6M45k1Bv!l)vdjfmgsSe9%ze*37SC0>9_L
zi$J!Ziite+mT#sPW;8{9EdmpRcM_V2yctTOVr}V45Ya@X%iVpnLr%`<6JxcpQZJW7
z8cdPFktXB1WhRl~Hl4PUPw4E0+n*{!yDCO9mja<K?7YHVAt+PjQ}o$iu<=t6BZZ@X
zL>l(#n-Se<rS5Rx3d?iy%fA8sbcl((#*cETgJAzxMc?PB5$It*eAtKkZ<j%mlLLK9
zNX5wiy!(o$IyW0_Ft6SzhRM1;qG@^dxSdT?=E$Y=TMn5c&Od@|`=@}ubcU<{EP?2l
zYk2gWwiOjR?dYccWz(bx<I|s)Q{E4Ix+dNo-MI=qi^%KV<ir}|HqvU*_TaA-`aBQJ
zOLCe98mb1!UtLsG8-8_#s^JZx)M|sS8x<4RawF^))C>E6ATb`3BWpmcOoQt<y1p7$
zt?<Bia;U_>W0YC&i_4DFt9eMt#<$YtDl1dXA!$_EIQN?X#w1#3P}!YVg2_+D)GMjl
zY@_EZ_ZKP?D)_w?>J6RZnB*Q7Ruv~$QHEOp7abg-XyAe)|FAORoics58~_N@dE!<o
zjG+SJj1*ts?22N1%Pi=br&C5CP^%wzU~CPX{^~Yk3H~PBUL_t>`8kvn*VMyv=fg8F
zE;Y1gK-hU9#R`_&5n`$v&+@j=#2b-LIZsY&v=}NAOjfOB3*&2UItP}{OqgRpGh>_f
zh%mJf#U&@U;;T#cyP}$M2?X^}$+%Xb$hdUMG3A`>ty6>%4yuP<(Yi8VcxH+@{t9(T
zEf55zdju@GID-2&%(4Va<|Ra3khy_F5iqDnK(rPsYx`73WPueFWRJV)QFt_0MR4ew
z^AAwR<vg|=phzs5Z-rG4)#1-FHb)GV#IjdQ9|H@5yhjZC9oGs)C<v(m{yc1GdE_Pk
z$^aOMeW@%vNNsR2L{&5WOJ6IDZE(7S*?fuKG(m90?jP@YAC@Lx&mVnuYW{T)lk6W`
zAQ3MzQJLOX6%1(L8WkS8<?1*;{fg{lW+Www5FFAWaiI5{&n``aKBE$<1{P9LalEU_
z&sy}m<B_~{^w2ST0-@f;1xoM32LBK}ZVb_r`Lue%V(tkD7>M+u8@ln#u7JFYkT)O+
zi#|KR&In+^((C^Qz6W~{byGrm-eEQBwWk;Gru$Vq&<u>12PTBnehngdy#zSGdTlw|
zntnZVw0Zw8@x6+gX%7C`9GLL`vpHbla6TX+B7XSrfgEy0hYHbG<OluSa8hV+gjKL5
zkq~!3FU99p%AYRQ84(+ysZfaaY<OwNu=29X$e0i-A&tP#-&Ir4!l{ia<PqmZ#Vps?
zAB0sCQd7I`M%U~t-^yB1;vFS?nfrUQ=G^`7GTM9VPxr&}ExHK6M0k>enBTju?E1^#
zcPx@a{i?zW3ISa;V@%Kjgr2)Vx3UHv;v0j#v5i!do{bld!wDqWoiXLi;bP20NC_Q1
zWmLa5QI~_)A`d}#*aQ+SfANbQB7Qd!Nc<ekUktYt$*ga%z{jh}tUQnDlwKTt99w`|
zFk})FuepBq(fkVhrxEi&a30QDw}R*z+*&Yz)oD7fs!s33<p7$KX$q|wplSumKQL0t
zONh_xqAsDG9jPgZBT2}K#}BuO{Uw2i^H`3a7|7<hYwc6|DZ$NLg9K(oVc+M{cG?S(
z7cf1zy5K((FXmU?lG7)bRyd%6!jm+|+A1h<c`(qgHfruImOB9+D&=a*m=P9-Tue2W
zMi{ldbHBI$76Kt1;bq$2jCA0*k6;?{#MAYuu(XLUXxgJlxOyt}ppV!0M_bZa>l(>6
zheiX141UI3v(dtiSKg*zR;+|a*Uv_OU@_I@u$Sw%+tp%rqDxg~Va^*|OD%zXAYe6!
z!Osuw69pNHQ-?@qEDa7bt^Ga?Xa(5g6(KJGSSDy#r$D2V;~$a?q6O+}b4^#6wsf5E
zX_GK0Km%<HlfwbJjQ2byBr6UlrV9H<25o35`%b;mtW*Zdevw_qa>Z@vtZr~zNs08B
zzlMH4(M*)#G<G0OP%!AQRn;1Oc1IcLsxCFw)xHS%6phyx`y=4WH1g5T)aFezNxz>5
zynvFiw~srA#@cLNhHk`!r@!W}8-+5UBM7C2P^oZ%kc0uzbTp>FHRO=xYa=v)0aQul
z9UgNxrY#bF^%AFxsI;{sv#0ekRc8}5bc+e-tghcK-OU0FGl`O!q9lk-bQK3kz*s7?
zV*U~Q9=~-fem_OJizGL{$4*=a7|@ZKwLY%<s$>#p@2?FP3Q>15nTl#b(ZW{k6q`Nx
zOMo<A(ndW=sepF)&Fx+z(=sVRa8tkMI)Py2b8b<D9oGr<p&Oh{*&L^l2K9nuMBlto
zRP<kZ8~skowo&2+Tp8oY5PVg4v}6~-itMhAuk1?gp=P9zbX6|Uky}~sK;&wp*haXQ
z0Q@}*LJNr-`UOqaW2|ka6i^#yjJTb3Gup4S7537+)$?I7x2Cx!$1P7z{=l%SYop;D
z<n!%=Mb3qZ-i(D7r%y6rDsj$r8(o$zPrQX$lGiF)iupV}s^@3s`_O$SKRYakQu$Ai
zIZk9KIl4$M#$!AvN3%b?9M9%khI?VB{yW>npItf;aZ4(|66znCH7E27N)R9I&GsIJ
z*ClS8kTkcOvZ{S>Fv|`^GkxEX=rkW1(MQX6IyC;Za75_)p3!=|BF|6pLRs<RXy?`A
zJ|vFj&qbl1DrixxS0ure?@9dkJn9ehLi>YUq@}YIj4k#cwM<(2dKCeZZpd6cJ$fz6
zXU8ca+ou~;k@S379zHDD8S5)O*BT7~{)Dj3LCoshK9dt=*UEKo$P_!yxozT=ZtBkj
ze<b7Li1O745yhqcLl}bgBcZj8wCh%U<9;2whZkQjI3nT4N_YCEn6G9cOsxA$!ptH<
zk+sox?+76vCZ3qEp`^&^@0Ek%Yd8w^LmHh68T^C%JyIG*QQpkMADJslfqSI>v^`G~
zc4AoF3d|9i#^@>JywzuSvW7krJ{v(4IX&@ZU5})Jy)F_p647?_s=B2@mHHAWI5l=-
znNFit0x5-AIV}8zv2z;Y-K9Mc<V%@0y=flu%hYEOI|)T4RiUl#tILc_^N<|FA2LB|
z>GGqK{hU0@PjRaEJG*_X4Jo*Ua=DamQ8b7f09*Mazbhhn6LBj%&=C`Zw8uz@XoMbA
z<gok`sF1c-AN@`7K_+EI)pBe>%j)N=G34Q-&zQal!IQE=*PWyC%Nzbkc?SQz^J9l>
z3}_mkctbvtd6Vvr=Tx5dQ|k=lg-=zHk76OjP=g9IPH_%tWed^LXiY9Cazf??c$snr
zz!4}Hl4G4@_xpkYJf2FXoKOO9-6J)oiWYVXuSJAY&Q`aFnV)5L@nU~x9O9VuEbZmm
zRJHYpRyw?}bQVa47oYcRa)$0@{Whq+Eszd#|A;H146&zmxR5#?^3=Qdiij=KX-Bvd
zk&plq0|^#&B~AjImXrDvvJ40$v(^a!JSp>w3$@6tFc)7&spiek=YVmKkS2(%uo;S;
zqBCrWkh+zGsP=MQ_NEL>&43-zSnE7k>kbEB)jJWqRV5}k>J?*Rcn)jx=c`6*MZ~|i
z%~^le&(UQK^+n_>?xxUQts<>aPR-TgOJSE6Uvk5ZUkP+>VveCD#mghIG(nOynL#Rs
z2$vVgxk2{9-OsO=D`|Z%@x3w)&CjCgeKN0P_V|BE-c%IL`c-nXVk9#S-YNj3*P!-C
z^7XvFA|<DHf*{bQly~v+dl(xgtdsP(I)Vy@Ruo(`Z`-T!_;wcK`ispIQbWSL^D>Fc
zQxCIu-q?|)UMe%sa3wKx=4brU5@->gWRLT4CltHUIy;}a|KrUJ{a?72odi_$Jtv~g
zkQWC&u|Ui#HM<rmxV&N`x@`^bRq)id9+AKsYgupsL+M|J!d|>R{#IS~nXxMkhhGSf
zY@Od4)>#^qTHlZOA6ih(()g<+OnN3wb6{Q^(N3|JFQ>wk@<G{R8zrPWC?Z%rEfxR1
z-(mUSU16C7kOpU9O23WfX9q2z_S{jg5IF;}sJg+t|I*T8f5j_!{O^Vs2v-NNMEdZ7
z0qeh^o4^+z!d6BJQP;);#qLT-nFXtF7a+{(W9Ma_T%3P93AFsy0{-7`vMA=k(*J+G
zXA`p<!piABmF<4n=5@ICFlGF4eK@MOV{h-<UhHPtVg$_Bt@-Mp?wYR!WNo>M>uhX)
zr)h?8eW=WL#|vUm?PV9~lwWnXh-FzzJ%!x>#?s)dgZwur=+ie)NL%H#f~c%;e2_O?
ztRDfj%ldcOwjk(ny5_GYpz}QMZ&YY${hM|O2AyZWre5QzFI62O!>~tkqcDdtBY{-$
zuP(XeSh@3Xk*0o^Wa)qAsTKNxZe}ik_%<ITtF7MK*xRq{?$xp8JF{l*eA$@U<y5wE
zaZV;=kF5C>)PtKt<$f>wWvxMo*99^R)3&;*5cJd|r=q^}Qw~=ZGkr7Dg^@4b4T-b$
zv#R2Xe!$2km%(4C))AfZ2<vvzmz9G3HsrRveOZ%|Z;PX=dga06t?K>6hixuAF}-+f
zZwfDSoMo+1_8Bu$7xPtlaoSMSxTLFO1~#1+>uc(Djj`l$TpKz(SF{%R8<nT}+i_x?
z#}K5+NiPTlj5XG|bzp<5;SYn?V{*74^Go|jUY$$u=|Wa#_LukXf|o&&Ov9%*ZleEz
zS}}Kgq?LbsqTxSuq@~LbLh>g%NC7!}{IaPsNc}&S&M`WZu4&tu*tTukwv8*!#C9^#
z72CG$WMbR4ZQGgo=6>GqNB3UctM{K?)xCF}Rdo~rsc4{MqGT*X7Wi1f9<rfK_LyS$
z&p>D7k%cwP1a?U&RIrc`PKXV&fRKgI#_d$X(&SXS1O&!lRovJGQJQVg60S*AF9wDZ
zh9=X$yV0h)E%*z&CuydVyRSQ+JH9@TQ=dpevf`7)2Bn*IUCx&ilfbHu<}m{SoElh7
z39m})DpJWpA<R`)7BU=ZY!!k_8i86HD}pRv059_SBANH%x_AfeTG8;Lmz@UCfw<rq
z$|Nv!r~Bf{@>R!Qp@x3%)%4JbzWB4LPxVLQRSboj0EXO)iCbQ->>+)1T{T~oy%}-k
zZPiD;=v1*g?z+0TArLF-QXVcw-NDyEHfrSg<C~_Y*HCG>jtgkt>ep=3P%Q6WnvrJt
z+4RwtdR4Q#<r_gbK6Yf<NL4?}zS+yh-m;s4B41tG<8L*xX6>RUS7xS~!Qbs=E;lje
z53Oy>LXWHQ$2v+95NE2^FeUsgp1y4FyvUw1VadDrg*G_B4otGbMYIlWq>so@%yJ!C
zV+>DAk}A<r?`OB5rOq&CO9`+Y3r`;jHh~pS@+$4Iv4IXgiPtJoJ5#58eIv+F{ON2O
zU0Y+9G`Hc;nWv~_Mfe^$zhPQw;=Dhl_$Cc%qK>XSYO|>TXO$oecP3UZixgcI-#ccF
znJq7up8Zjx1AN0)D-mL!udb@{XsbvCrCnAgur+f+WxIfw{$K!<B1!TmjYEd+3H>o4
zfn|*egR+@Cqfbd)SeHLedNl(erm}_}Clq=82-p7cA`8%vq@&iJlk<}*b;&T@mm@wX
z<w$)y4OnS!Fs1)(9_U$Qa9%2Dty&R~$<S;+uj<8m2rShU$q!i35$9_Pz9~gm!M!@(
z((s5#1(eTGatrGNCxjhMO}qdF?sq8*pNE;ymFl<v9i4+M)a+!|1M>}1cA((mK@yos
z<RVS_mN`!sMXYjs7Gu7Ki3MMhgI>PW0ZW@JX#qtMNijTe@pH1gG4`^<{AR@h;s(T}
z&3#(~u$Qi#%j!zW{ss#Xsm|DQOrmKNB0cK9N~^$rZJLyDEKoClR=V$R;aujtgT#1b
zA`U4#ht`VKoHWuito?@~br1x@B1L^j>cuo=exM!L_g$Gz0SpZ^`C+o-yaA}LPlf0=
z^n~1R7J(vVSULvS{$R8709Q#R@ZbWBjZyY(AbHaC(7|(oHtzZ@NbtoHn;_g=+H3fa
zy!pe)r}Lf|tftQ|FMWp`rny9H<W7W$0AB!qmDVbaD~@9L#kn+X>Z;N&8jH3-LHf6@
zM&!|x^O%ZcPJiq#EK4mpID>Rd469b;u>zA+kvrUva9OQIDXPl_*T6IGn29GAYKQ0n
zASA;!l#^KpqRw`sb%#}-2}Ud`ZK&<)htt;RIog2CA2(DI+sP*f<UVz1J?mH?f9td)
zzdeNua(jfm=DFmD2W4F^d-U<|)=F0aU)80;Ir7>^;yl%Jzz6%{0}^a#h=NyKLgPR?
z+h)#g+PQn_^B*+snviZU(joHWllOKpV9D$p5IwQbs<S0JccDYV`BRCKg3`|{Iyv6D
zD{$lCQhE0De1`P{-?u=x#L}>oi6pC_`)m%$bm~s>3~@o<?8)o{_CkC?kFl2O*R9i{
z);ZyiSB}yRq@}dyvnfj)M?a=7jsgVN%eR~f+Zk`qaZ`Brn=&Z%jyOWoM9?20z*uGo
z!MnB*Lg@5aDOQ9C5N@3uq2dK*0r(nlP(CK>HT|MFt~;^<GiAL+doOiIH8Cj_+=cZU
z*PU*<Z##<L&s^tDKfW1E4ajuJuVa(we-KeuN;qcwIbF4$rz@`~$xr_I<&%*s$vOF(
z?yHam0%rCp51eUO&nGNb;~eMXAD!cUR!-~md0n|xyx=r{L7TObXl)CODd=Hi>&e$k
z<m>`!AZ@c$^%MzW3|Jt;kr?yNKC`4g;qphv-mowYqO~qxIDHG&T*1Il;sp@iK|H~;
zRY8%8d5`6`s8oac%2s^AFKN^&{3cN##QttYZ`4w%O1kG)vS3r_nko@(3WSWY^hy%k
zD_xZkb0hmkTBJdfu$mY-P*DN?TlRxM-eP1OB3FiJK5ogaE%S@t)Zzn*d&`8NQU6AL
zC9qU0aDA(=vpOu~8PPvMOGiOGcbw0<rp-<9m97+w{AtS-xxLex>;i&OIZa_^2(khD
z;&117LsI_yz=<&pOSpyG0=nv1z6nB$uqp6DxHM4~*{6ytIT39}>Z<;BowyqFU@THt
z9tvb``MojCN=M7LPJs?9k>}02!$N}>-Hdf5sj+7zPsGcEpJ72v5=@DH<P*>xVbShM
znTCaXY66l$r(TQRo{5JpXcn1GZ4$yFyu=I%t%@xcR3pUKP%~9_4y2j%Q(-)PkDfn}
z9I;eUk*#9=IplZ{KjMiWV(J5dk%FI*g!Mq0g2h}Kb^c8wfG~@54Ml|sRB_zCI<@{6
z^>GrT2@cGf?mzHC4F8I^S9r33+|on(dnh|1Z>%)RxVYT~j~E*AoAP*jexWIP76myS
zPmxHAcOLo4+KFvX7l<VO)YYuXI^C@OT!8$6y6#B{iS?>eBb75ClA;yi&nJL{!SU3@
zWMvA{qx5Pu{sRs@9^q`F3_ray9*Q&n76E5u$F_G0Tl}P{sn+HS)^78+pUqFXayKO{
zi^~-OJkHkEj&_t9g1Y0<`H^--_8B+x!zqT9=#17`5WUA@RUk-mPwZ;c+8RhB+N`=K
znJs*ymvdg07$&iKn$G*<XbgK-hE+hXCw!L4)7~SC(Vb=~1qJ%g;n(ymJ7MDCgbU9s
zHyCCo;6uf7$%kx@e{0p&FjgT2y_5CW*)>Mk6>^D1*zhr9ipPUJ%R8Yk{s78rc=2jq
zx?!bk{FtF%6OeF@OlMxwiOa{3JZqSunUzIK$Krxk3j28$=JhtBU<A{w1V)M@i+MfS
zyoBQBFdgnJ-Qpxw*t(w^ldGwG>VAPyC$e(tOs@2&>aIiai+vP@s~9<ky^D*G;e|=i
zym>CD!K+B*cxuJH5{ZoroEdkOb07;B!(&?FM&tYiDzMEi^#Kvu)$>mUMf_&sIXt9V
z1`|{6PuR}`LE+?M@z!%&B1y|M_RaF73@U??hm`07>sJ^Y!2lLnd(8Vpp>y1ny1lr3
zl!y`Wp!J+)z{ok;P0$-LP(J+_fL&p*f0=;J+-ts3-7_(rS04#pN+)SQz)n%tOxR6_
z@iS9s7}z{TeV+AZUSI^TvB)a<)51kpw?}19ciIMhgxJi+fk$dzsUIxLVQ}Nw6>zz%
zYtr38Z538+YKBWeW51rNm{Tpg2qKiX&!^s#!ve?C(NY6ft*#v{M7+r!kFvwni9Vg9
zVE>1ImnPXi@nY&lD&bwEzxTI{dNtF18pL$JC~#UVZdYp;{nAd(+?7ql2-I0p0a3h^
zdE7VU7KJ<gSN0#yB={@0x(Sa*-@-62y)FS_T$-c6jKk^G;u4ki*zjt5N5q!3Mz_b2
zl@mKyBqe`#hpIPYIA`$qwBZkiE2-*csTvNr8y1`EtZ?veVe(vs(U%OZ)|don^|e}x
z0-(f@-Js`glt`btYLu>)trJ-z)<va54l2RNUreF>KsCRt^QH<g`+e067MEg0Z293_
zO<MAYCE1&lsnAr6T+MeHzmW&nM^Y$`VoS&A-J84LU-~Jge+Z)iSaDYxZ@;wJ8n_~j
zccz)Ne-Wuk>%e#W!F~rPh@w4+*$@<sRsesZx0)y69F03o56Pt`XU5p_TXRAuBqPQ>
zK4)>+_gDsG){RQP2XFWefCz@LxK4qr#%x=W<xZcani+D`VZKw*_R@DCQB+VMB&1Ap
zdKYB@XL^w_KGG0Tf#&Qr%_zNZ+Qu*b9j%3#xG<B6C%)7_yW&+pG5$19ID}_b!vZy)
zt;UOES)D?GTgSFT0EH~h$sl33-s4@ErCqjZK9cgObjBljYhrL3iH?lOrZuQ-p@%$m
zzo=bv!1v!fwG5V`DOLx}%tJ|lkfGkjFw{sRm?9U~5Qqh54e+?P;tR{K)$(F(1?qQ!
z>mPy&Qi9cIKa_7gh__E4y<?zsI?(6}#j{*D5&C?OW?b_wGVx&?^#qIOFUKguc)BZj
zS#e+Ny>=^U1@#vNfA=^ut28X2_ieyr<^WqKZ6Z-Or8MH|Ad<`?oNVuOc^D;a300H_
zM@89Pv5h{>T$*iPbD?^mIOFe&5u_Bf2CQ{5|AFdS+Fwi*XSv_QuaOXm*g$E@V6`8E
zQRKWE^)Z_$Y0gO|a~q&cE+vcV=jv9uS%8|>#SnVFD4{g@06WNT*HBsw>2!tC0{d{{
z-?m)$6BB^p0Jsu~0e@^&+QoxKB>XGk((rAyZ?!zC_Y&)X*aR~{dd)P4=tBS}&bgS2
z{qy^PL8LkzJ@}LlCE)1?0?<p4OU6yLdk)N;Kq=zWQ3p_Jw8z#f+jN;B2$opOAoA;!
zeBy9c_FUk=ylJP<Uu-rZwMw0`hPtDbIyA9FLprhHNbn~U>Rcsi(8&_kltfWR6M$DM
zB@k7TLP~t7P?uK;Ts)*HwZe_wZDjbBZM%!6b?Jhxe7&{7sfsC;9!MX@l+!aDwGefQ
z4x^TY#)Apr3tC6<q!ze3&_v!WU1LdD>_!dw?x(%AL$?5VUr|4VvE0UoX+_onVuhyG
zjno6xQ`GYfpa&yn`;1$$&NDY>HXLD&5<y;Kap95Z$GXLCn(%38VzTiyQ7L|OdP+}a
zu7451!k+S7(I5}L1rAla9ZX6D2Q~D@gQ1A)Q?o2U$Tz=VT;Sn7SHn^)@p8UolA$6F
zcs7^fv?I!?$j4NO(^q_w4s3s@^vSb4j!(6!$h~{1{)_Ii6nb%)(rH_VwT<)qu;~Q1
z>4al2@3A?<mo{$#`>CO|q4u_Avv9^NpXV^|y@IoDy42y31Z)~eiGpE6<O#H86x=I>
zjFQWawJp?DvP0va!#N^er>_g=QN4?!$QgS^+?fbZUO$e-pB_^&i#<6xi*}@zikhr)
zQ3p!<HJhi;{0i4(3xTZg`Gn>O-n4OUat{Ysi^*BT_O2f8jyx#;l8S9XRMCoMZ2A)_
zX({EoS{qBU0kjhm%{)Y@gbA}dPEho2-^nP_{xyxl3R{(C!oi@~ily18z0RaLa0~`Q
z-}?ov&mj*bb++L+Cn&la1{QW6ioeY&-ik0^fbt>FeFp7$E%vk?b`~WsQnvbzyglt2
z9`}pj;QLZOF2GfJW`1Ani=s|17tLg$8U+`!R+s>XANYrUg=l>KXV@4VJI=(f0lM4q
zc{QF7gE<z@FTyJ!hnv-i?+gSUFQ;~pYVfl-`Z?LKZ<ELC2>fqt;%le{C3*5Z;l{WC
zFSAqZwN$9H)7C|NkiQGy?ue@E(A}7Xg?|NcL2!wKV2fX9dAtshHJ||p-F=%=!ny8q
z6#06TOF*fvSQIa|E4OQ!zt_m$j8YEAXLb#*=)p7dhKLDe#O1>ypGw~Mhuiss4SE&o
zUCOJU9zDRJ%X0NAEI1iD47H_vlSGZkF~C$89(cGGOkm&MeNlaq=G0Z^LGoC#&+(5;
zaLHJmE~eLwe)P>Soonm@y#9COv=j>${%>Y)XCS}#)W(vgsSVQX`2E(M^D$y3#n~@U
zgV@<MLC-IUI+{qW77bca+;u;vou!kPAOml1;#fUBLKLrq^Gzg|80~UC@f-tgBe6LZ
z!hSFAGxlHF*1eK%!Ow@bpIB$;`|fXMllQR9LFG8)zQI}{0$pC=vjW!LwJ3E+j*sq0
ztw2N<ycu4}6w)T*L@;gxs-rUhFfIg_QS?r>DGaFc@HzP4;aOZH2b_Z$V?;5?hCMg*
zn!6cCC{y}g^m+AoL?$;eAC=f<u@)*RZdAn8*t@_xWT~*WSLRzgqJ8i_u;wrx1UdM}
zKLTPt>(GWM_EJYNcPYf@<v0gbU}9e?eZVk2#7DP4!5WA`!ats|4$w?#x5%*q+n3c%
zu8g*)`*?8Pw5EwrR++0-RmlpI-~+^LQ>{mDE%^ugN=T0ugCc2Ib$OHbSS~)R(7Omi
zjZ9k3U(d1-{M$k<#<4`~+j1kbgN}?&yxq;C&cE~NugdUGNRR`qr}^`}2t-ziw}9Yu
zND&z4NgN_teN~?NfvUpDyi>c_B^0D$$U%w_9IM8HxQLYy){J#z<i+Z6Lzt^x`W%PQ
z0tWKbe=qP$ex=97+^OxyV<mcBH!GieIDchlgbZGjDl$%m#nJ3aCJntxH8c?1jNM1I
zE-v`jQz;A{N}0>v$J|XC2k3T=4g!TR3r2+)_P(#EJsgpZU#ejJ820y9k*w+P@sqnB
zl9o~obFSN-5jU6z9D=9cynbWie^HJCnF-Ek_hYH71W5_lcLsNLo|gKJBcNoqk5c#`
ze{rg+LtS})^(X{gJxq+Am1Jg{hJ6adCBk8!+}{d>I_;u1kC3In1Oy{5Hv>zNHJZs5
znjAml*}FNZQo=Ul=BGBKuJg#6S6Zrl<MFo)yrWxUq%rpONrcr;ig~VIq$~~AG&gzZ
zr)On)NUZwno3N>Zyojk7hV6B@O&_H#+`Ni^H}s&=v1+EevijAm=O*FaVtKKpajjc}
ztaO=b1DMn~BYxd*1Ljzw4}l3A@`qiyNuq=mV%qB(#Sat#fi05rT^EFLO~bNLgjSc>
zSJeJCu>K0517vo(tmJk=ys?J>M|?&{ev!nS5H~cObS#1rSXcN(j8<2c>5`D6w2tf7
zjkvK{8I{la@AP+{l|PZ5ymZ+vIZ)x*a@lgzr?3`tKDAD@Y<ZX2cEA}yezBS96PK(<
z(#Q4dE4Dl>KBNf+PeRun(}CTCE(QK$%Jyv^`vksei?l5pL8gQ{6s0E?fw#I?&W!G9
z+C)pZbxWvq8L3$`GAe}p$97nO+37R48}bxo#dEr&Qg2J#ZMnsBo=g#@IeASh%rv$3
zCyobcB()INWZIHZD`1NqVUEe;JpLx>!$#$~`lfTHjZNvIt*&KmP29<5qHD)>(a~>x
zDT_5fVT~3K%Ybc3xNBC1#@T$N^+~ISZ6!Z%293?xQi>N0^`8#KfX@*0`rA@o@8FAT
zsB`&GEUOCN_|)~=lHXT#bL%f2XZWAqP55N5u%n`YbLctRQH>0A*QR;vQFGqagnY<R
zLBJt){v&=~X>+W1#k`J)!VJdJRaXokyH%~~(F{OUSN8mX&?MrQyK$stRrJN_8j?Wp
zkvR4O{4Z^Vqxx%u2m=IUj^=*~`lcNV5Y9)}4C60QCd=D9OJJjRd!f6-KB(4iLqL0d
z06RKXrX;z+KDpkwUBP~_lcJsC)qGnR83P3c9A(LFOs=@F++QC+{gdCcPuUTcIvlZ|
z1hzapkd$@yJ+ay<ZTk6DZdPFTu&d|sd-nas?`v-m1T#_tbd#ymb~;h6vh!&UNJ&Om
zi>MyfQFU1*rdhojeGzLl{LMmVJLfqNj@w~3XBub!DJCFknUoW~z8qjLV2$^@+>HX1
zzkSZ4A3OtiiMH9G)F{x8-`pxn7O@+>p8bL7A}3@y3{7A@M8Vy*CAVFWIF!T1<e<L~
zi<w?dt3(C`bf(A$M{AfbA*Y)IDM(`yf(c`BV|-z{TUVvoTZZhU;v`S$m6eH^or-#N
z9HKAor4QHj@nYhO`pB5|V<`#PHn1BH3QS3jhjK>DH%dJu5FlvnwyLF0#cSdT1$M6#
zZ18qzTQfAt9;sl^A2aK%_~@pCg>_Qp()DFxmpa6s=1SZ4*=uzdMYCjqo;X(5oMhv{
z(dB(zEBvvp#a1pisvEaXUh>{EKF)%>rO~fl_8B-_Ime(8ne*<ahm9u$3P&uP+_!p6
zvdVy9(PZy}g7jWW?|lW}dlz=t{TIh_6ioV<;UdHqM^_y@8wYhcDs}#x+85>WlnsG*
z=ur;WDhz}R_=p6&Me__0Dnqa)Vm(Gjshb;d)FwR&H(;EMbdzAFeKFCT-Ig4E$-4aK
zGi-#-;?EInxP?iXbRq=$>IBkhmhdo$FOD!Kejf)(j0kQ2kZL;=o?Rn5)dp>0x9TTa
zCPh;SH*Hd8zFU~s1yV6Aqabc3g)G)YP&0~_iN4(1;c@Mm-(~T@_R?w9F6{(DUIimi
zp3cI_mO`0P?HWD-gKBwij}GDE1U1oqsx#4xf_P&!$(ge3=p}rPpg(z7QtSLwVp%wr
z)b0###i4ADrG59KZ8H5jrgmQYIGWL*j+|7cc$#s65id0@KZnq(3&wC@I#!RvrVJD`
zc}=SdM#lo1wY7qQ?%8r4UAkOF<H1gt!y<9Y6UirX>5s^!cBg2nM=0e+U=;dHNa8Rk
z6OSdR1P^6%75kui(xcdvAns#PwNEUe)W6QKvx++Gk|I@P=%B{I!M1%mN#BD~Z&~S>
z$J6!HZEokW811c<M!MF92<^bPRckg)lsU7N<NBt$&ND-R*e|4rQAl-ZUCb@<wwqDn
z8*r@MKH%9|HI~T>=}jB3iJ%ga)vN0pvV7DdI!MQ|gk(^k^%8^T$}3nBR>8|jLy4Kc
zE=NuJDc;yGJK4Q)RVO0FMbi#2d?W{tqrvP2@CjY;agYympLu+8SM^1Bm^UyXv=)A)
z$BGy?QAf}MC3Q9vaj5ue2ht+%CG->!2?Xo*aAjdD>+D7_N2BVDezDXJyMf0#@!V-l
zodn=f$EwhwvPjP_`FNCTC?>YxIjNyQ{JA`OmQ^H@t*Ugyq^(r<Nir@@GPdaSzYR}B
z-;z%tNio<OnCuPFr8zhcPHwI@m4|h#wjU+%IoqWK-px!?G4%{C8<E{i6nasrq5GsM
zZ#QT*akVy?irjlg%Xu7rqN`k>Ox@Jb)%18SEeuX)K#ChV<yN`SzrBNf#b1A-n7Od}
zHLPz=4F8p0_Zef^@Fco9jS*7BiedM=k>AWHY=G3=!Nw39B8L}Up9V)+ma4^A&pH?m
z!ZxP?A|<ry)Ra+lcE$vw82mhIG!T$KP0q22c%@`>Ow92k*S%zgJf&B;)6NY_3^}60
zB^*Tq4Y^#YePB|#FBZNY8^FhrqL)yz@kIB=2}87#%Sz7pTM@ebhNF*?h-zOlGaGfv
zZQ6P7qKX#@;EeeS%nI0kqiA2Vr6}63Y&%v5y0ML^&*z*~kj@ok`vxQmDwUd}iS^e}
z-?Z%5Rm&l#PM70=N&Wo!2i0KZ&gRQpo@dtJqbT)p_hI@y$KO)<o|Z?7aZ{6DSh6Q|
z7^mIEPHEsmt~C?5mubqKv9LdkhaUp=Mz(Idj^K15to{`t%WI)IKst&K+IkpUF;AQX
z+!@%!T`u=%#9)k3%3dq}r~|EayAG?=n8CmH!2&W3?B4C1ZBQT6zER;EY1e2HX~21b
zMPnz^k=2P1?HS_kjP{Oq3$hWmeAr_AEs$0byE-$^?(?#)b(j|LD%@_Pwi*(%LVjlw
zJo$#AvDP=|cR8ud59?1(&_}1XmuVCL<~X{@KF@WEVT1(hQZX7-!-n7=I#-O=w8^|o
z*w96qZj!M>UOh{V+3hcj2VhIFR<ufU>)|`=Pg4tx(@};;bTtOsuNyB$QXe9pmHv*L
z1ben*Fi>HnWoMC*FSQmeJ=SCE7~<Ksz4?BG%_~1rP?N%7Ma5kt2+PT<jlgLH=H=SV
z##9CN@NYY78tLS+1As%>L=5TdT2brdx>Lpwa+1d|$6We068K6Wxxe&F!baQ|&s7pR
zl$NXuC6`oi3J}9TYEA17G5kP5aP5fSaDISnI#xzANK&8QAygL9p|IKcF>Js?yRHxU
zXvzf=6iuHcb=PWBZ^DVxxF3fDUpU6wevU*hwgyKVtY3u>XIdUCa0x^aO19CqYHPS9
zu`dYUXsTy$uB%DR^04ViJd4h7l#|9UlYmL0#XJR0%{SPhqaVrB&z{5U&dg+Rrx@9o
zO385wN^)BuxZOicKQ)$`=k7N#;9Rnz+VF@5%Y`gGshFy8Hw5qg1W|DShA!yJt9nJq
z$TD$(FaiuiWu6WUWb_!WUy*ZE@V4svwd&C@-1t~Z{HSQZ`B<j4+R)e_SuO?d3}Gr+
z_`2&Hq0Y(AZ!WFFSh&^zeEu{vQ+Sg4^(`*Q&xtvC1282DPfQ^tLE4=D6X=TDp~G%8
z><(gJ*A@AOX3QZPVwMQNTn>MiKs)cfbC0;XP9g$wQ(ssw*!|cIBS)~BQVg{XNM;6Q
z;Z4vGuyho7&kMD)b8KPy{I)E0CA9=YS*^)sySa<+o<MZQ2aM7^Td8|wM#S=OOXEL{
zM#8>{t^_`#Wr&9lM#6YQ7DV>6?p(hnyN`!Gj7pUlUK!ybM`VhCQNEdRJw0<yAzDvF
zKFehg>Ukd^J@oN^+6;{FFz;7a!3hiE!Py)C;^8Cbt>|>vA@hw*yV9$+*+F}_|C^C{
z^$4FY6yp6QXa@b-Xbg5FDP(X<&GfJpd+IZhw5H3X1pyX`UgqephJAD<7@yKcmyak{
zBe-1l&h}3?t;+`H{Z5<-0A-Ed?nmf4oZn+6q=JKLD0`|9;b#lCP+P-NR`c8`gG}~o
za_Wop;jix$On;U>r}s_Z#~q-fxnlbMCTVSaw6-|ETsY)HQi$+ZohweoYG;J!#MmYU
zJ-&E}<7=c5?zK`~6X1y;X3s^0gnjdu`^z8PyA=m4zB2}%OVJ><lo2sWr@?)j4M_M!
zv>2-(KV1!c_UG5tvz;-b<-P>67PMe-{!%S$+ge-~q#h{~r!iBIm0yR<I-DC(fu<J3
z&D8u*rwX~k$rE+L#?00aGNF`kA!1ky!p$p_pMoui=*$NPld#WQP@HF!jc9jGt!sMz
zN%~EzGv@?+QrRa$eWsb079m!AW_!Nvr#BSglnu!-GwDwsDzB@Ni$LQ&`i4Q{DVqk~
z)?30pm|>$+-JIM$&8J3`IN$zZby7XCwIYN&KX**xR?3#I`P@$25sP73{J~Fr{&VSx
zWjo4(!WZY0!WRLG+&5_hs+36ennIRCGszV{g{c&nVv<_CY*JB76~&P_B3|dIkxj~o
zswLyq+@`s3IgBXdfGL(JNd6+zp~TOG2=b5kop^*4-kRP~>$H7FNTn$aAkWn2(`%K@
zrFm>^ze(m-JNeWHOSG8y%D)sDXEXClyF~dn{9#!|`|qY&trq!g^80r!*MCE+{w?so
ziMQ>7@&6_Yxnljhy1zm7fOt$qRr3GE8*nPAj(P{1Ed#RkgKMS8Kldx-Y36B97IYsk
z|9}y6IW9i}gPJn_ITCs#0(+!0^=F_B17!!Ja0Fejsus9etsKjEH{|gRobo=RabqWx
z+E&({i>_*%E@=1X|NH^2N9Z7gBRCL{zZm~NrH23ixJRLXwVMH>*4=hnF@c(Vhz6L?
zfp{Y5=prJH88g|6MHz78O^o71L#>V^fpA29VW_j}65@zQ*^j4uK+%Uk_aBf(U@o9>
zNJyvCe618gc(S4%qX--Jg9r=UYJd}3g)VM{2sg3JVv3zB=}QO#SbJNpmK#M~YdHii
zU{sg3c`hw~d2=^L3ugw$bl$tWmJOz@l-DIhqBt!HD{X}KbwYy==H+zrbaN?|>TEYr
z0CKrru|C>d!2)@Ga^_fEG(5+9tE4#&&R_0^_9d@-J|c81x}VBM4}h2AIy2OFiy9l)
z2iDN_TbnQHnDsiZ1q<~HtUsOfO(hHZK(R8@n&|X&-gme5v8YW}j;=D)lv_A@`oA1+
zNUKZ`vXjqpP>7Wn$t?Ru;6+8)qSGP}KP5OAm_7UIg5B&VzSzLZ|8a+!1NZ5<@uMGk
zC%5@!@%x4*mY3luwenb&Jx8X{=A`6&qZX+C^T;Z}lVq*`rMsN|JN}nXopeTxk#y!Q
z1;nHgX~8#Wp%Il5CkUX>H2{TkrZ7rd*OxBTr?aAamEB~ISQMB2*=}#sQIjND1HPa_
z`VzU_VYSd?wZLZglgn<APT_V?<qsE#bUgTR({dToZ?;GClWFh2pSyTHFEvU#<b~Iy
zRA&z%aA6(->%4^}vuEa|9P^noEhB(MO`zY_m{qND#(h`HJd6D$kG_kme5{oszd&i(
zEO$uPV&<4Nk5pW9Y~0A>hUeCvz*EBZtGT4R@XC&cP9DRNGq&SM(;Fuyixh&|s@)*|
z@R`oGyCdd^huhWJ8piCIg>D{fJaRF-E(BkVkmZr9$R)jZlgrWyD^K@hc1=v&CD8pe
z|GW*rcuG~5uTj?g8(^WxCdG#oo4vAFn|A@Rd|ExPvW?j!sPofTRq+M|eN6jwD!arC
z+^(8p%`i9gjQ87zSIaT_w`yIkE5IZBJF{Y3?WWGaHoew93sB1j*FTe;A{Yecfk@wu
zpS8McksjKqHCMF1dFHK)V52~|0NiRI9G!n8<DqvDq8vlB7s4#YXp$un;(*<F{5!X)
zG!0u*IzkL#^$YCXQXw96sn5^@T&BS6tN9<3?x=EFx78kl9q<@v7Iq^eYk{jtMWlHn
zvx?XmohfkLs?*iJ^}-^*-dfbLnYM^8rR>tyZOz2fMkVdBpl=JIp<Mr=4HRk~Ao=(;
z=tN*uFBRC7v4OrJ{t9iKPzbR)=Juk~j(-OU&*ujVXFd0Lcq5K_3C^LRn4HKT3Py&m
zQJ!OhJZ&6|Gzb&3|AO{-OHhn>ar9_Zchau!WviRC`DxWD%D3h_317BbUl44j1a4&^
zGs$RKV+L}b>ga6jc(uQI1uWd|5+t!4_96Io%_HvJhrg2uY)acmo&SFF&mSd9q|{<V
zZj4C)H3V!goY<<crQVd69#>jTx^fJvbGU$-P~^aGpDRPn#1$1;sIRL24$V+`egtex
zE0k}VA5-#zF0nBs%l&y#BhpJ~zUqR^x<O=u9E!l@(xb;H{^6xu0QB>co=d$&7V*PH
zZ=(514Nu-@FP;;Wg?->1LF)jYHi}1_6XDz?5r0lRq0^lXaH8k<3vAvt#)oP8Jqopn
zrAsa?bw*t^03OdK3HpRM0`p{7XB=%X>0D6C*+UeG(3y##xz;tUM1{^fo^F%pfTlLd
z#?dCv%;ETjo#!e$C)Lv`iA+?t?z5~zU%{cd-;<foAx$LdUMLFmJ>DX>v_MGiYDW9<
zxgX|zu<79r0gb4~B!MrWUytBX=pu9m7rpvVIlw0`O1cN41Fb?v&Z6_1mp2eH4<WF0
z&j340zs$qlC(`cBX-pS9LkO6;9B@z*u?&qs4By0=#O6x^MG<o(*fB=fGU0N*({b^S
zu4fj(Z63gf7I`M;gP!!WiSWH(4{$1&IKkzfA<y-n>{GvQB3CrHZWyrJ;VnXLHO@%E
zN}Lo;kSiq2fzh`?=X#gM-#%8;q(d{1S4eY6v`^npV%ZZaTx~x^K8$(CSiZ=xP0G{T
zc0(O^50=d&>c_p$N43*lVIrBX3n(=G{Ivvw*be|0`dVQ&l^=&sB&pxb7BL=}$~X|`
ztZcSIzQG9LxDz1?LIBcJ3y2zUcP~kNIxR=HnK=<JV64ZQxDd_7MI1|YOcVW}I-M>Z
z$Wk>Vx#^8P+vXHHZAm8UFFR3!#hHtX@Y<}(s$-Omy#$v~zLk0N7ajAJ`o~JX()PFc
zWrpRbuu*pK0Y{Qv34&GzdRHoS@k8)D4bmvj40_&)M`F5^D#&F=<StG&G*pq$wDL@Z
z<q2b0V9@yC#N=|d-7(5>t-fRWF}}{L+uiU-6_d--48;;BRMD~TQn3cBij`+7B^`ye
zsH$AndXoEoe5G+SztfZ>ycU7WwiDI7j(Hy<<)HI8pVpN-D@n?jWThZq|4u{WT}l92
z<uud|;Z$lh$3OZR9O6__g_R!aY7J&gMQp7cu&g}vvc7p17lfGlrcBvs#`xN?-!-Ny
z79dY_>gM;60dekYz?-Rl2H}NbCJEz1jbe>FP6mCEO|J<sr;C5@^NSE1ssHkf_lxy2
z5Mg<RQ5Ns_831|Q(qLnoX;|u#g`wjmVi}QJUgij?W%GD<TRf(xqGqqt#$|^4wVk>H
z3_(<5pMGGP-K>)xQsP2Z@yxwywe=+~J8hr?y<61l@QJh!w3q+x(#_Sz9{Bx!pLVXL
z{iT(lg=r-K!a?=*bUB9|;0<!lC|&2+=ND=K(Lk>w>|#mOz~OgdS&|qCbH}A(#|zMe
z6uhN4%e@WH%s+CNx4`g<@yk+@jM2&i3I*YUczoxe{`UFds_i7|K$3OrDWvUK^)PS?
z(^0gc@Mr-vEMRId6m`k1!K4<uL_+@{{U)K6$^fyjfN%><YF5x{pZcN?`TSz}hUt7!
z+D`#MeVosNw7N*=GQSx*#(ubb(EjBgu8Pk>hmkN3)Qk5^@QXnC&?+bWtOgAP#?ryk
z<U^i0r01a^8N?ogeCH4cAb&z_xs8ve=JoUsCvxBxJ2>-yqkXeE_ZvHcB`Ny<X-@Ph
ziHnV1U*WL}-v7Q;hHs%M`y~FR5<3<;>#a<B?*EquPc&9EFzlk`vG`LCBDJD3M+ymP
zq7M*zjTE4v(E225fMIW_?6L0$1dT^_i-z-GT4jl4WhC|iF$7{@Km`*u&)6BH_|1c?
zu^Gf|gy!=N!Zl^=B1D>zmP1R>8^$}PRZmr+)@s90MQEgqYX4H|wG8~Ib$fDbyeKRg
zCr8v{0HDv)uS^-HK1K0?s1#GqxSF3QK#J<u``IJ%)u3HsprGOj|M27oK3m5o+|c;n
ziFB2yvuV9+-gGXRhod`{wM8)mjGCd{WiTEoyArs$c3PnGK}ygm2b?Q73dW5bI|?^x
zKwHk2`ZYl4@^pA(b3oEIiX9I{Lro__+y)L2Z%Bxv7^8$()&J$06m$WX8K(8e8a7fM
zl8^#(y%4YM<2f#}py)DA`UoZjZabco^A8SpCzXIIU5NyQjenkWgQEa=!JL@<<5V+^
z4RHa|CnYML4|au8C`jQ3^vw9R{C1tpu@}VDAN|ScICm(2btQt6;$5Wd!0CE{ZZ7jg
zE|`)-Cw>A|7|!-3K+AsTY$58G27<7Yzi!9C&IH3NshKKtMbEHyh%yHtJl3+Aey;<O
z_hCMFaX8q)wNc~x!ddo7`N&ocAE=3T0oS?2nRqxXZ1|xOtFGWythPwP!B&q<KE7r3
z38YRY#E?vWt)3&Ldh3xj2R?F~)4hI?YhCQwC{N+N=HpS$i@!8n<Q8G&Z+gH4hiKRi
zDV%IJLWD7#PE+7G4=M)go`OSO$`71cdE8RJ{CJ}IYqBKjP$Hn!Q;YCUl)Epvn{#BQ
z{oKXU9D1{O?c&Cn8|-lH;zt##AVO0BXDVhySbZ_!b)#jmv<DH>Lh59(yqb??B4IeD
zm9F)fMrB^tbIcgRMuM#3d^gvtS4S7aPR#7$h;)>PH|;*1>MMn6A&JiwkKa5Ur9(F%
zL1dS_1Db1u`Yo_*JP-F_C^XB9Z1L%C4q+orHgXL8I<FW>1Qz<vpaK)mfSi-?zDs`e
zQu)$$;H^}h7RO3fVV+F+1vRAT;j6QV>x`W4jrt?5EU|8G;!NSzWeNG&Hjli{v-u-D
zK|+c?Ehk)<>H{WSI-Kn-rf=uD{+^_AaB*JD!npc%U;;R6;)=QgB=CEuocaaljF4O^
zzh3^FZZYf2_(J=uj?=7+#$yjMqav7#SK`)IPa+SN+=qlo_e!s_>W_|fWSCEG>IbO+
z4~)$s6yV~rwtl@A73o)$Yk~A`&@)zpUu5o!>pQ^bK5JG@s%yBlD8XJoz4WyhRr{-`
z?Y1%AV;Q(Y+WnWiWpoZI&hV+9#4!9`FijOI@(C?1UzJ^>n9lL#QAP-l!i{zRSv<6R
z-q_H#O;B*_X_3TXT$HKUC@(K30Wj4E%Fq<+eqfFlpWALXdOM@zUE?2&^x{Qy^^Dtt
z*Y?F&^c#zfut^`~ypB85(1^?KWviDYa?{pmRuWi<*D~0!==#k1&d;P@9dzR${4gPB
zwpXZ4yV+KSPcXZie_65QSFS_9K!xMM7Tp>3_QvsJ%!ks=-y`(=P~s!T>LVL`=9Fn(
zwrA;<@ShpH%kZK^?dCHz9;K;XWzc*$k8w!=)r;%MyJB`A{(L~!RKHz5kLw!7l}#vm
zfdT(gIdpqd2PW;L{|mA*)jiC@ld6k!y~x7Vq+SD5%{FE28WGgeY&{kY))D6f*D25Q
zZIKpb)^m&1>KPLxb=G4OC^kX6rCPowoo~yKCR>iMApU@GvgktHya9$ou^;6|xY1)2
z77Yy*2*QhNRl*Z61(u(lX+Cs`!LhAByn$as6T5%IiG(Yp|Eglf<XL}k(R}RwW@F=y
z+RO8*=lZ?eicIn_#0!#~A*UB5p~{*ZRw%JglLKvw1wsGbZ?0mvA=_~=asMFFpf*kF
zpHw;=S!h{(R{sYi3vY^o|4K38E;3jtvRXp9UJK37oet!|?4^8d%u-74{xAAyNE@(|
znv*NaTM<LzDsv5h{yMRHQz%XD6JyK`1gdQ99^0KEvb)le7|ItCheNxSNf@f|du9+C
z7FEMEf#(UX6U=qoSM2|6_N3muoBD_Cm$bSU{GKuc;291Ed3o$*N}E{5sG^67{YfvQ
zfF{02+?Mq)dRTE0BLNQZ$tbofYytDR)TR%{lDT=&5Z=Xl-Z-49b-KV->-rG+vBMiH
zNSRL~4z>Ds_`*DKHWA$IFyjUaiNWXB=oR<b80)wf=vgV`q)La*<ez8il>PVpNREz~
zJdb0>;6p5v6{Ap$$6i?8IF(M#@^o+V%BY6TpW3(m|8$-~te>WSGA)dn=IQI+0JCc+
z1Y5UG&yN3{fgyr)pIgp<tDZRid&Z#<<Vdjf3@*;{sK>UQ2yMG@mf>~r-@em=hB4Fs
zPb*keoJx*#qEzubR$|G;*rVNlJ}u6i+w3bM2#6>C|3n4uC`O>oe;pP>cTvtnX++y$
zFws|ab+tA7kWz5b7Keh1RemB!_9(Q5T@M&c7%-2FA?<6G&u6~%6Ya&Z<`zguZ-j1N
zUEO57^4w-*X9xj--;nh%YI{#dM+)aj25BoK?+CuStuN0U+pt}!hZAcsK7(+$L-+A|
zi75A`YLcPL<iJa2*)HkboiuxK8?Q-D{&iOTl%NYGLaqzlY6Q8{FTaBh{P4_$HD%OY
zcb~$!d%IXdHS7kgQMpUqONt_q(T`IV=m1v+Y0)SHZble-$O5~K0^2rIKWMWmiGqJM
z;aQ>xgP>|q589cvPj-(Q-~QFwVzNdrq#xNZy(E{6RzPeFY#v$sNQj|a;fsnxzI(QS
z{VxM!EhB2fwQ1s@ODoItDdL!WmT2NhHhUwuspBfFUp5T@DIKRY>vG>{lLz)G7BuoJ
zwpEerKA-82becp1o*+DJ>_L7^2=fnU_9O77RM<8@$jNktpD?X$roUS71EkVyD%j1m
zi;9B(0p=z`tb2#kAf~F~b4j)G>2^Cov%uDKasoo}w8VVriKr*Tw%&Zqj7~!Sy7;1^
zYXoZCSciBN^qHn`ZBGtWsl93LukGbpBV!*@Rb@_{ngsW<rSHw}_5RX3#FNI_{X3+7
z16A59s;@I;)KWF>#*s99n=UBvfoEUa;`FK47AVK3Z(Kk(<sN)Uu;1-5%!H4weabTI
zP%mx#+POv>`VMK%yB0i<nz}jm8YpIAWL$4p8`EqMjr5~v!sCqSKbz8jX?EcIS9ebM
zf4~JpWTb!S66hqu3jCz+7z|)dSW_f%AeD&9neXq6e?_O9##}W}4M+#No~Zo)L&l*9
zaKk;`f4^kuygXihgMla-#r02`yATQ7YmZT61}n8^KmJIQFra0i)kr61LM69XDRPuf
z%Ww>sQfAzy_3+`v+SvC`vx<*mRenZ{rYe)+FRhOGb8<>o1JfoC4lLp|Q8h!ZVWpYp
z07yBY#DyLjqm#Ft%nC9?=7gD;Q5ew0z{kR7g;rohjNHvfHj3lzM9_A+B0g#t*@*@9
z{}HX0C=Zbt-1H1+v=)mJxzxka&}Zhp+WrDpM_JLG{nPm;I$-s3wqsAM49srLc&@FG
zsSi5S^wPxDXRWkHj_AgJiOi0$SLF4XOF4+)uII;p@9csmNs#=Xu4Mh=zwZ!?83ZP2
zzXTmw?U#$InVqt;gQJ<VtCg8cl4BeW@PByXSOq>O)TX9nQFNFeHunGU#0U(YKcfCc
z84#4Am^@i|WI`3q8)xJJ+WL)Ocu)OW2EQ`trvMLoSx7zacwbm6zN#CgSZU@pQ&aCR
zzPAo}yMO;2Yk{QA8Ljy|n6|eiR65#dv@I{WPE?jW&`jF2*oHy1oZ>3f(Lw{$22i%J
z$ZZ{W>v0DF&zlND9Quc`Ob->B+m;Wh#&kr5&d1KptP&lKZ9ffd_z-{i1>s?(MC!Kc
zlN4XC!04kblxYWJQI%0fNorJ=_(cb@oSD@zFgPu`gNv;sJ&Wo;RFc77Cbj}ZF(=}_
zh1nhC;t&HEzIbjDwXMUM;e~)lHeGv;tp?ha{OFqb#^J_IjDbO#@TZH90(P5p<wk57
z*FX8{a|ZBV@!+~R1|7eU%S9}(JFGk1?^p(fd0m)dxns}6_Yp!pdzBCdi>*I5hvP54
zxh0t^54jbYv)5d@)6zndct=vo?){V~T9*+g0?@lE_Ss9^nBNUh9nOK$dv>AWhxfFD
z6#^xKpSd@D+*JeQIFJmZj}rJa8ls@5H2WI&ZS<fR#l2ME(?j=+l*#+v@S`sg?55a-
z?!@Fs{Ns+!d3NU*iipl*qwyjA%+A`i1%3G_yO_g8#IaG>G5fxHg^_xo<z{>apOW%|
zOow14uOw#3p6V1%SNXsjPT39#z4-#;Op=pZXA{=Qs?W9GHMIeh)t^7o0(woLngo8H
z4+<`;3k_TF3ii8&u70}@15*aHJ6uf>^L}bt?G_vGHDOJ#Bov{K;>*h3QRG}&gQA@e
z9uuwy{Gu;!pid-0$Sm*--v8_BhG$5_$izneQaowLRi9<@l0X3jTqMppT7(t&mgqZd
zDr(dm2mtDIXaq9!9H6->&ZG}aZPHH0aT{I$=!Spg<h)&b>V87(Dkm)+bc$OZ3T-qn
z!O<S``PAw0D<k20zJyErj^%_tt^6|c$fD)F87RE``LAN@<Dx7ib}K)N(HSvli0Zj$
zpG+1Q%A5124_OB2KW&S};?fhuB^GUG!u;A5<+P}Gwx^B-<HF*QzK%E(%#C#*8vgVT
z&bc+w(}zB&Ccii;1%F}^o{?ZfV$Z+*F`0k6uN}@bbuJyQE9CH<!ACHT)*&8<e4JvT
z+k2clD<qa&569HmX5-#qVonsDPT+%g5QfaZD)LNmoYqH=Q(YALJN>MiD!w1mEJvir
zW2aB4yS38ZKex_!?|*;5l|zc^%zwxkMacgz)ng?gr$HrASK=q_C1C*z{EtQAsZzj)
zn*syk<Lx@T3H5F>J8fjxA4I<3d*+5lhOqoVgp!?FJjzN0Y?J=AZu#rr?qUAAdP^kq
z!-%j2#;2oW!dx)?7og3^T15{9j>1Wj-ZG`KT3Kyn$y9=lHG4H<puC@1yHv7K**pZU
zNRwqK1yuu{lT5S3G(;1a#5&vmFbOy8gWK#ivM<LW(GOE3pX8!fDBC!Z&RB&yvyx%I
z2jI@jP?$AOl+eTy`tV1-J8jA|Fq$<BK?%3+NKSMGsB2%SmMzmRs@>9e)>KgFRGv=@
zc=wADdn#VCmndt<5**Fy^goF*{V1TuD`h;j(UT&s-&L=ek|zL~ziK8}$2jZ<zy!bk
zHJixr8NKe{TB1k8w$GVJIsZCPt<@yi^JUVik>C2=^h57nb&+Xj0;6<U9@I3hPdbOz
zIU&=wjAFi^*61l%_%^e8;)FNgM*B<Jp9K3Q2+RIZ)4-I=<HchZ(WP_!cN$ckyDu}X
zKau^j2vRi4nTITJ_|@WVuNEW_ql-zn?|~4S+2~gxhzPXPZ2^ce_R$U*C>SK0M{Not
zdZz(j4-L_ilW$;OzN@|ih7mQU2i-~jJ|$tSoAseoPDM>*%W1v2)MgWKlT^6ZZHGNF
z8c*EwJ6_0X<CF^kr8xu`iPa85mNaN>#_|qDK*Y&GQL+Wb5n00*6lHD1u^afa915W-
zT?Loj+aB5k@$jc%8FKd!@1Q<G_aZ6Kt+nj7{MbZX!_3-kTJvfWdAcjz_kfeKnv$K9
zL>nC~E88_D_bL04aMukP?cxyVom601|3fVoQoI-RZwN7@6Q2ln#~spKR=Ry(6IxzC
zF#%G+G2D|id5_3Z6hUrCG9IDR-DvGwThMI#;US{nZ6p)-TOnW1-kx0TTX2w&(<l`_
z|6!yO?^`3E;Q1b1{Y9XXZ_A*~T@zTGkq5pH0jJ(wd5}<$0@s#3{f^w1yU73bOFlsX
zAHVsx0Z{%w^M6m}0>1xm(aP0F71hR_K*TMY<5a+Phx^w{W=@t17gH^mSK(im&ZG=(
zHY+&j8`#KC*<lO_6?NrwP1=W`)4L#G^5~~|BBhlY(&^FBjQ6dd$NP=<Yd7#u_cNA1
zLfbU6`-iK;<9MGxI?;hOX*~n75~OHATk6bMr0GN^uA&VPM)8qXtIgCAfS(-g=o3F0
z7Hzu$Z7U}m*)J9#Pn(^}YOJ%i2d2wK0m+$IyOTXi^*d4&Z6qJvfJuERx!SpQ(mK*S
ztld7IDbvAzV{Hjv@ovA5h6_80s?zM4dzXwZn<W3dLRvNr6*eyVOqFu*d5lErhVb~l
zy5gKsos}NQPl+IhBB835a1-#8-@Zdxp_H{lGP86FA(VokMR6rLMS6DW%RTfRf?@RB
zM@nsl)I=V4*-1fRf+jRHcKy)mw_9V!bOA{7Sf#DtgtC^Qb)64B0u&DI1s<Xo3lW@v
zV?k*A>)CXO1mRNQ2prSNv<OD3=l%%(ee)C?(n%z+4g-GYfLl*nLgYbZof%=%Ef4GU
z@CTCSpb|cHW-@i~sRRfdzv(ea=r7(h)K2J98z|S1f|j0wB4OYXI>ye;Fm5%5KQCx;
z+dA2~9tVLR*2#}wl3kX<%G~y*mW&hYC(@b<wN;6Uvs*9pNTw18M|t7--Qu*2!4+dp
z7TgNJ2xI+qQgo^8D4ApPBVh-=Vf21pq|EwU<A8oSde)_-H0!7iyCF)Ikm+QjLh1ID
znRvW7W_sBa01BLeEe89t3ErTdNYdb&(?NlsdH8Qg{Rtm9cjyzVO9oc+4pVKtktXRq
zrz`Y=CPle?DORZMH4e5P4SU0cQ~^}xUM?%ZO@b<=gk6)Wc@e9@6NY))jTppGvqgEO
z8n5}|wOjKwFQw$C>49;<ei^2AR&%%JU6^N(oMbd-O4;cUzGXh~?qJfZBsRr)6GeGn
zb~|(hp~Jm6^nHSdkFq;Ns>C3o^Z~v_7$_x*N|I|v`&i45IX|B1=4vaVd3PpNY;;~A
ztC*Q@XS!v7{8;phXUsnbA-TMXmOWsCxte$qib6tBnljH_wrg(qy)J~r(YKJKiI^@L
z32i1F<J2-KO$8t84y{<9TEsz<gC=vk$SKz;bNLazfRmw${HxOZL!#*Zv?Hr`F7jJO
zU+(jA1=~%*KAZ9UPEkeQGvPx^b#W1xsN?5=f0OP<mn_7@bclguFi-{G|998;6Uxm_
z95?@E|LJ^HfIEcC@(@csa)E!czNziBsVbvdMzTHGeZNK&X}pzu^kkDTdysEQV{#jn
zu}jJnZp4xZYfmE8j*e(g3~6Un>U~UBL+>rPfVS4sWYUk4F-yrQH&d^$snQ<kGgIH9
zS49o%=|N`fHC<aTc@LwYnEWPd<T)cc7`>+bh=Grrl*yp_Y6P_G42ksY7{XDy!@BpD
zR7o?eFWUQz?llUyQc1AcFyYNn=wV8H2Y518w=C)>qG}Dt!QVs|<Ef*&q=rgMUDEo!
z>`{G*hTt>yKL6|Aws-73L-7Tq6n*O^57tyDvcRy5%UYtiLUv~R9V`;&h>u37{T3v<
zEBXKCudNlzz882L^h?Hd@5OHmzJA%W>qTRDqg3I?%i+B{zU6xQGfmPHm>A*ke=<XH
zBCA&BxA(^qk_|+9dJmg--ilb0Ez_N!^wL*nf9F&&Ih+3OhY1#DpWSy{V3FGvP=7yD
z(Ph50PR>Wu%L&yh?jK4PyH&G0^GizJmh0C&7taf*Z*5)C+PrUhW`)J}iYwoBdLQi!
zymZKrJCpl-q=9Zvghi#~YAfIYX<?Pp>mtHkldpVts$g2*daUr-xl%9PhOn4}vooBx
z>sA*WndWYo;?1g_Qz?|5Q#tKlD@&m0iOKa%0)at}MK@K>9kr5nK3KR%deeuEts7sf
z9Dg_AUd*L9mK#SdF{`(~aW#FXyi>J;`E;$gPED!!y#?=?Rxim}-+3Z4@##G+!MZhz
z50xuMN%s8Om$^jdSm8%LMah3l>iHvAE_{D<+mdXX^!xL>&-kvnt+rg?s><9=mrW;J
z&Qr=2>`l|(aq0Wtdz>+x-?%TZ)a{LWl(}xNs*L|lqZ_YV_D(#0Z&u%0rJSw3cc&kg
zTTm!^QnsnpO-XUv+E03`riaII-*pXraqE>~$i|mBB|)aSMoyPc3anhatYF66U$rZK
z@Pj%~f{}?Yf+zRPUCBB*p(;Xgvemp~mc!G9W=>u>PmIY$U~=F*naQ;RqLUx26kvti
zt^R+WC=<UhSb~26`(%G%X^^B0`1WXE+bx!zfx(6Wc!UWYTo#2Z77<ecD+b@g$;QBt
z1RO%KMNwQN2~}*v3b{`)V1X#pQ3bdOT?<TP5LeNm>uynoD+HdCGWoQ!JlHzW4QPvi
zy~J8z<!XUq-FY<>4dn~9WW=t+?#W_cFh)`QKm$p!HY@l>rpW?}M47_1;Syepv}BO)
z$+1T<Azc@)aD%QoI8ecNPfUIfG$p_QDhawyhac>4#Ch@z3~DGQ#h6Y$uviIrMFm75
z_%L*!57z*(4vNChmOzE>vXH}}85rgOPp3!q)hcU-$qx2Xliyn_gY1-rpH~bFEJqZh
zgzZ5py}_#B$KL`~*`cTsa%7ln@8|(`KjI`-1_pf;RUXchA1oD}+`rUR8gbAhx`j5A
z?=OvI1)s+^*>RaD(_NscOXVhOdMbiVM;w*|Je&{3bX^~yLfOd=mdVS&4_g5`R2N0j
zt5C2L43-<qAT|vEkKRF1q#glP#5Q@>axH1|&#=Wr3=B#r3YSm5zuZm+d94eoZBHsE
zKUgk1*`f-PT@V9^3=9e=25qVaDwLVLbA`MNVnm36K^{dBLpRu2{@vi5DT5dWK~E<W
zd%+6hSL(<hdRGh#z=0BY{$yYf>IW&pHfkaU4roNf6g>=uCr>T__Rcg`=}3c15@4P_
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 067/210] 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 068/210] 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 069/210] 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 070/210] 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 071/210] 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 072/210] 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 073/210] 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 074/210] 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 075/210] 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 076/210] 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 077/210] 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 078/210] 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 079/210] 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 080/210] 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 081/210] 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 f9c14d88c7fc21f61715636806f66b5f572c0dab Mon Sep 17 00:00:00 2001
From: Tomas Bjerre <tomas.bjerre85@gmail.com>
Date: Thu, 27 Mar 2025 18:44:48 +0100
Subject: [PATCH 082/210] chore: formatting

---
 .../main/java/com/diffplug/spotless/FormatterProperties.java    | 2 +-
 .../java/com/diffplug/gradle/spotless/BaseGroovyExtension.java  | 2 +-
 .../main/java/com/diffplug/gradle/spotless/CppExtension.java    | 2 +-
 .../main/java/com/diffplug/gradle/spotless/JavaExtension.java   | 2 +-
 .../test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java | 2 +-
 .../java/com/diffplug/spotless/FormatterPropertiesTest.java     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java b/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
index 455318e38f..ad180ab77a 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-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/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
index 37712a470b..15e042962e 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-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.
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 db7d9bee9a..4dcb033fc5 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-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/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index 343092b4ad..b4bffc6b20 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-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/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java
index 862f82010f..df47de98b5 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaEclipseTest.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/test/java/com/diffplug/spotless/FormatterPropertiesTest.java b/testlib/src/test/java/com/diffplug/spotless/FormatterPropertiesTest.java
index 58ae1c913e..6356e02660 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-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 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 083/210] 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 084/210] 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 085/210] 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 086/210] 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 da3b75b4cc8e50960d3dbbf2601d1ba4ab9613f1 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 7 Apr 2025 20:16:56 +0200
Subject: [PATCH 087/210] fix: separate node_modules dir per npm based
 formatter

without this change, using the exact same npm-based formatter (e.g.
prettier) in multiple formatters, we could end up using the same
directory to store their node_modules inside. This could lead -
especially when using parallel builds, to a lot of issues:
- overwriting each others node_modules mid-flight
- overwriting package.json mid-flight
- starting multiple npm-based servers on the same directory (overwriting
the port-file thus leading to cross-access between formatter steps and
their corresponding node server).

By applying this fix, each formatter will have its own separate
node_modules directory.
---
 .../spotless/npm/EslintFormatterStep.java     |  9 +-
 .../npm/NpmFormatterStepStateBase.java        |  4 +-
 .../spotless/npm/PrettierFormatterStep.java   |  9 +-
 .../gradle/spotless/FormatExtension.java      |  2 +-
 .../gradle/spotless/JavascriptExtension.java  |  4 +-
 .../gradle/spotless/TypescriptExtension.java  |  4 +-
 .../spotless/PrettierIntegrationTest.java     | 91 +++++++++++++++----
 .../spotless/maven/FormatterFactory.java      | 10 +-
 .../spotless/maven/FormatterStepConfig.java   | 10 +-
 .../spotless/maven/FormattersHolder.java      | 13 ++-
 .../spotless/maven/generic/Prettier.java      |  4 +-
 .../maven/javascript/AbstractEslint.java      |  4 +-
 .../prettier/PrettierFormatStepTest.java      | 36 +++++++-
 .../spotless/npm/EslintFormatterStepTest.java |  5 +-
 .../npm/PrettierFormatterStepTest.java        | 10 +-
 15 files changed, 163 insertions(+), 52 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 70beaf91ca..d32f4e58b9 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-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.
@@ -68,13 +68,14 @@ 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, File cacheDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
+	public static FormatterStep create(String formatName, 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, cacheDir, npmPathResolver, eslintConfig),
+		final String prefixedName = String.format("%s-%s", formatName, NAME);
+		return FormatterStep.createLazy(prefixedName,
+				() -> new State(prefixedName, devDependencies, projectDir, buildDir, cacheDir, npmPathResolver, eslintConfig),
 				State::createFormatterFunc);
 	}
 
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 3ec06e0434..dd798e6e55 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-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.
@@ -69,7 +69,7 @@ public static class Runtime {
 
 		Runtime(NpmFormatterStepStateBase parent) {
 			this.parent = parent;
-			this.nodeServerLayout = new NodeServerLayout(parent.locations.buildDir(), parent.npmConfig.getPackageJsonContent());
+			this.nodeServerLayout = new NodeServerLayout(new File(parent.locations.buildDir(), parent.stepName), parent.npmConfig.getPackageJsonContent());
 			this.nodeServeApp = new NodeServeApp(nodeServerLayout, parent.npmConfig, parent.locations);
 		}
 
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 27a1002df5..0f81934e24 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-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.
@@ -51,12 +51,13 @@ 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, File cacheDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) {
+	public static FormatterStep create(String formatName, 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, cacheDir, npmPathResolver, prettierConfig),
+		final String prefixedName = String.format("%s-%s", formatName, NAME);
+		return FormatterStep.createLazy(prefixedName,
+				() -> new State(prefixedName, devDependencies, projectDir, buildDir, cacheDir, npmPathResolver, prettierConfig),
 				State::createFormatterFunc);
 	}
 
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..712e6fe00a 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
@@ -798,7 +798,7 @@ public PrettierConfig config(final Map<String, Object> prettierConfig) {
 		@Override
 		protected FormatterStep createStep() {
 			final Project project = getProject();
-			return PrettierFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
+			return PrettierFormatterStep.create(formatName(), devDependencies, provisioner(), project.getProjectDir(),
 					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
 							Arrays.asList(project.getProjectDir(), project.getRootDir())),
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 5532045bc2..7968f86e28 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-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 @@ public JavascriptEslintConfig(Map<String, String> devDependencies) {
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
-			return EslintFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
+			return EslintFormatterStep.create(NAME, devDependencies, provisioner(), project.getProjectDir(),
 					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
 							Arrays.asList(project.getProjectDir(), project.getRootDir())),
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 39e050d51e..9794a3c349 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-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.
@@ -214,7 +214,7 @@ public TypescriptEslintConfig tsconfigFile(Object path) {
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
-			return EslintFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
+			return EslintFormatterStep.create(NAME, devDependencies, provisioner(), project.getProjectDir(),
 					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
 							Arrays.asList(project.getProjectDir(), project.getRootDir())),
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 b6547204b8..6c85949861 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-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,10 +15,18 @@
  */
 package com.diffplug.gradle.spotless;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-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;
 
@@ -51,7 +59,7 @@ void useInlineConfig(String prettierVersion) 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");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		switch (prettierVersion) {
 		case PRETTIER_VERSION_2:
 			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
@@ -81,7 +89,7 @@ void verifyCleanSpotlessCheckWorks(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessCheckFailsGracefully = gradleRunner().withArguments("--stacktrace", "spotlessCheck").buildAndFail();
-		Assertions.assertThat(spotlessCheckFailsGracefully.getOutput()).contains("> The following files had format violations:");
+		assertThat(spotlessCheckFailsGracefully.getOutput()).contains("> The following files had format violations:");
 
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		gradleRunner().withArguments("--stacktrace", "spotlessCheck").build();
@@ -104,7 +112,7 @@ void useFileConfig(String prettierVersion) 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");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		switch (prettierVersion) {
 		case PRETTIER_VERSION_2:
 			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
@@ -131,7 +139,7 @@ void chooseParserBasedOnFilename(String prettierVersion) throws IOException {
 				"}");
 		setFile("dirty.json").toResource("npm/prettier/filename/dirty.json");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("dirty.json").sameAsResource("npm/prettier/filename/clean.json");
 	}
 
@@ -169,7 +177,7 @@ void useJavaCommunityPlugin(String prettierVersion) throws IOException {
 				"}");
 		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");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
 	}
 
@@ -202,7 +210,7 @@ void useJavaCommunityPluginFileConfig(String prettierVersion) throws IOException
 				"}");
 		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");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
 	}
 
@@ -226,8 +234,8 @@ 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("prettier-plugin-java");
+		assertThat(spotlessApply.getOutput()).contains("Could not infer a parser");
+		assertThat(spotlessApply.getOutput()).contains("prettier-plugin-java");
 	}
 
 	@ParameterizedTest(name = "{index}: usePhpCommunityPlugin with prettier {0}")
@@ -264,7 +272,7 @@ void usePhpCommunityPlugin(String prettierVersion) throws IOException {
 				"}");
 		setFile("php-example.php").toResource("npm/prettier/plugins/php.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
 	}
 
@@ -324,9 +332,9 @@ void usePhpAndJavaCommunityPlugin(String prettierVersion) 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().forwardOutput().withArguments("--stacktrace", "--info", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		final BuildResult spotlessApply2 = gradleRunner().forwardOutput().withArguments("--stacktrace", "--info", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
+		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");
 	}
@@ -355,7 +363,7 @@ void autodetectNpmrcFileConfig(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		Assertions.assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
+		assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 
 	@ParameterizedTest(name = "{index}: verifyCleanAndSpotlessWorks with prettier {0}")
@@ -377,9 +385,9 @@ void verifyCleanAndSpotlessWorks(String prettierVersion) throws IOException {
 				"}");
 		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");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		final BuildResult spotlessApply2 = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
+		assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
 	}
 
 	@ParameterizedTest(name = "{index}: verifyCleanAndSpotlessWithNpmInstallCacheWorks with prettier {0}")
@@ -401,9 +409,9 @@ void verifyCleanAndSpotlessWithNpmInstallCacheWorks(String prettierVersion) thro
 				"}");
 		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");
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		final BuildResult spotlessApply2 = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
-		Assertions.assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
+		assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
 	}
 
 	@ParameterizedTest(name = "{index}: autodetectNpmrcFileConfig with prettier {0}")
@@ -430,6 +438,51 @@ void pickupNpmrcFileConfig(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		Assertions.assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
+		assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
+	}
+
+	@Test
+	void multiplePrettierSetupsDoNotIntersectOnNpmDir() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"def prettierConfig = [:]",
+				"prettierConfig['printWidth'] = 120",
+				"spotless {",
+				"    format 'mytypescript', {",
+				"        target 'test.ts'",
+				"        prettier().config(prettierConfig)",
+				"    }",
+				"    format 'json', {",
+				"        target 'test.json'",
+				"        prettier().config(prettierConfig)",
+				"    }",
+				"    javascript {",
+				"        target 'test.js'",
+				"        prettier().config(prettierConfig)",
+				"    }",
+				"}");
+
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		setFile("test.json").toResource("npm/prettier/filetypes/json/json.dirty");
+		setFile("test.js").toResource("npm/prettier/filetypes/javascript-es5/javascript-es5.dirty");
+
+		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
+		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+
+		File buildFolder = new File(rootFolder(), "build");
+		assertThat(buildFolder).isNotEmptyDirectory();
+
+		// verify it contains 3 folders containing "spotless-prettier" in it (recursively) - one for each format
+		try (Stream<Path> pathStream = Files.walk(buildFolder.toPath())) {
+			List<Path> nodeModulesDirs = pathStream
+					.sorted()
+					.filter(Files::isDirectory)
+					.filter(path -> path.getFileName().toString().contains("spotless-prettier"))
+					.collect(Collectors.toList());
+			assertThat(nodeModulesDirs).hasSize(3);
+		}
 	}
 }
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 456c31b9a3..541d7385eb 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-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.
@@ -83,12 +83,12 @@ public final Set<String> excludes() {
 		return excludes == null ? emptySet() : Sets.newHashSet(excludes);
 	}
 
-	public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, FormatterConfig config) {
+	public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, FormatterConfig config, int formatterIndex) {
 		Charset formatterEncoding = encoding(config);
 		LineEnding formatterLineEndings = lineEndings(config);
 		LineEnding.Policy formatterLineEndingPolicy = formatterLineEndings.createPolicy(config.getFileLocator().getBaseDir(), filesToFormat);
 
-		FormatterStepConfig stepConfig = stepConfig(formatterEncoding, config);
+		FormatterStepConfig stepConfig = stepConfig(formatterEncoding, config, formatterIndex);
 		List<FormatterStepFactory> factories = gatherStepFactories(config.getGlobalStepFactories(), stepFactories);
 
 		List<FormatterStep> formatterSteps = factories.stream()
@@ -174,8 +174,8 @@ Optional<String> ratchetFrom(FormatterConfig config) {
 		}
 	}
 
-	private FormatterStepConfig stepConfig(Charset encoding, FormatterConfig config) {
-		return new FormatterStepConfig(encoding, licenseHeaderDelimiter(), ratchetFrom(config), config.getProvisioner(), config.getFileLocator(), config.getSpotlessSetLicenseHeaderYearsFromGitHistory());
+	private FormatterStepConfig stepConfig(Charset encoding, FormatterConfig config, int formatterIndex) {
+		return new FormatterStepConfig(encoding, licenseHeaderDelimiter(), ratchetFrom(config), config.getProvisioner(), config.getFileLocator(), config.getSpotlessSetLicenseHeaderYearsFromGitHistory(), String.format("%s-%d", "formatter", formatterIndex));
 	}
 
 	private static List<FormatterStepFactory> gatherStepFactories(List<FormatterStepFactory> allGlobal, List<FormatterStepFactory> allConfigured) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepConfig.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepConfig.java
index a1f2e52b41..ecaad55446 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepConfig.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 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,14 +28,16 @@ public class FormatterStepConfig {
 	private final Provisioner provisioner;
 	private final FileLocator fileLocator;
 	private final Optional<String> spotlessSetLicenseHeaderYearsFromGitHistory;
+	private final String name;
 
-	public FormatterStepConfig(Charset encoding, String licenseHeaderDelimiter, Optional<String> ratchetFrom, Provisioner provisioner, FileLocator fileLocator, Optional<String> spotlessSetLicenseHeaderYearsFromGitHistory) {
+	public FormatterStepConfig(Charset encoding, String licenseHeaderDelimiter, Optional<String> ratchetFrom, Provisioner provisioner, FileLocator fileLocator, Optional<String> spotlessSetLicenseHeaderYearsFromGitHistory, String name) {
 		this.encoding = encoding;
 		this.licenseHeaderDelimiter = licenseHeaderDelimiter;
 		this.ratchetFrom = ratchetFrom;
 		this.provisioner = provisioner;
 		this.fileLocator = fileLocator;
 		this.spotlessSetLicenseHeaderYearsFromGitHistory = spotlessSetLicenseHeaderYearsFromGitHistory;
+		this.name = name;
 	}
 
 	public Charset getEncoding() {
@@ -61,4 +63,8 @@ public FileLocator getFileLocator() {
 	public Optional<String> spotlessSetLicenseHeaderYearsFromGitHistory() {
 		return spotlessSetLicenseHeaderYearsFromGitHistory;
 	}
+
+	public String getName() {
+		return name;
+	}
 }
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 9b279c8845..dea60739db 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-2024 DiffPlug
+ * Copyright 2021-2025 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.maven;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import com.diffplug.spotless.Formatter;
 
@@ -40,12 +43,16 @@ public String nameFor(FormatterFactory factory) {
 	static FormattersHolder create(Map<FormatterFactory, Supplier<Iterable<File>>> formatterFactoryToFiles, FormatterConfig config) {
 		Map<FormatterFactory, Formatter> openFormatters = new LinkedHashMap<>();
 		try {
-			for (Entry<FormatterFactory, Supplier<Iterable<File>>> entry : formatterFactoryToFiles.entrySet()) {
+			List<Entry<FormatterFactory, Supplier<Iterable<File>>>> formatterEntries = new ArrayList<>(formatterFactoryToFiles.entrySet());
+			for (int formatterIndex = 0; formatterIndex < formatterEntries.size(); formatterIndex++) {
+				Entry<FormatterFactory, Supplier<Iterable<File>>> entry = formatterEntries.get(formatterIndex);
 				FormatterFactory formatterFactory = entry.getKey();
 				Supplier<Iterable<File>> files = entry.getValue();
-				Formatter formatter = formatterFactory.newFormatter(files, config);
+				Formatter formatter = formatterFactory.newFormatter(files, config, formatterIndex);
 				openFormatters.put(formatterFactory, formatter);
 			}
+
+			System.out.println("Created formatters: " + openFormatters.keySet().stream().map(f -> f.includes()).collect(Collectors.toList()));
 		} catch (RuntimeException openError) {
 			try {
 				close(openFormatters.values());
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 c6b3e46e3c..f747f8764a 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-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.
@@ -103,7 +103,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		File cacheDir = cacheDir(stepConfig);
 		PrettierConfig prettierConfig = new PrettierConfig(configFileHandler, configInline);
 		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
-		return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, cacheDir, npmPathResolver, prettierConfig);
+		return PrettierFormatterStep.create(stepConfig.getName(), 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 ad113de833..2b85cdcebc 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-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.
@@ -69,7 +69,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		File baseDir = baseDir(stepConfig);
 		File cacheDir = cacheDir(stepConfig);
 		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
-		return EslintFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, cacheDir, npmPathResolver, eslintConfig(stepConfig));
+		return EslintFormatterStep.create(stepConfig.getName(), devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, cacheDir, npmPathResolver, eslintConfig(stepConfig));
 	}
 
 	private static IllegalArgumentException onlyOneConfig() {
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 abba35e72c..f5f5bddccd 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-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.
@@ -17,7 +17,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 
@@ -158,6 +164,34 @@ void multiple_prettier_configs() throws Exception {
 
 	}
 
+	/**
+	 * This test is to ensure that we can have multiple equivalent prettier instances in one spotless config.
+	 */
+	@Test
+	void multiple_equivalent_prettier_configs_do_not_intersect() throws Exception {
+		writePom(
+				formats(
+						groupWithSteps("myjson", including("test.json"),
+								"<prettier>",
+								"</prettier>"),
+						groupWithSteps("myts", including("test.ts"),
+								"<prettier>",
+								"</prettier>")));
+
+		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
+		setFile("test.json").toResource("npm/prettier/filetypes/json/json.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+
+		// check that each prettier instance has its own node_modules directory
+		File targetDir = new File(rootFolder(), "target");
+		try (Stream<Path> files = Files.walk(targetDir.toPath())) {
+			List<Path> prettierFolders = files.filter(Files::isDirectory)
+					.filter(path -> path.getFileName().toString().contains("spotless-prettier"))
+					.collect(Collectors.toList());
+			assertThat(prettierFolders).hasSize(2); // one for each prettier instance
+		}
+	}
+
 	@Test
 	void custom_plugin() throws Exception {
 		writePomWithFormatSteps(
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 da00e37d35..6b8debedfb 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-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.
@@ -58,6 +58,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			final String cleanFile = filedir + "javascript-es6.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
+					"ESLINT_TEST",
 					devDependenciesForRuleset.get(ruleSetName),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -100,6 +101,7 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
+					"ESLINT_TEST",
 					devDependenciesForRuleset.get(ruleSetName),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -157,6 +159,7 @@ void formattingUsingInlineXoConfig() throws Exception {
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
+					"ESLINT_TEST",
 					EslintStyleGuide.TS_XO_TYPESCRIPT.mergedWith(EslintFormatterStep.defaultDevDependenciesForTypescript()),
 					TestProvisioner.mavenCentral(),
 					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 54ce09e7e8..915d757d33 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-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.
@@ -63,6 +63,7 @@ private void runTestUsingPrettier(String fileType, Map<String, String> dependenc
 			final String cleanFile = filedir + fileType + ".clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
+					"PRETTIER_TEST",
 					dependencies,
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -90,6 +91,7 @@ void parserInferenceBasedOnExplicitFilepathIsWorking(String prettierVersion) thr
 			final String cleanFile = filedir + "json.clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
+					"PRETTIER_TEST",
 					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -112,6 +114,7 @@ void parserInferenceBasedOnFilenameIsWorking(String prettierVersion) throws Exce
 			final String cleanFile = filedir + "clean.json";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
+					"PRETTIER_TEST",
 					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -128,6 +131,7 @@ void parserInferenceBasedOnFilenameIsWorking(String prettierVersion) throws Exce
 		@Test
 		void verifyPrettierErrorMessageIsRelayed() throws Exception {
 			FormatterStep formatterStep = PrettierFormatterStep.create(
+					"PRETTIER_TEST",
 					PrettierFormatterStep.defaultDevDependenciesWithPrettier("2.8.8"),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -137,7 +141,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("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\") (...)");
+						.toBe("LINE_UNDEFINED PRETTIER_TEST-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\") (...)");
 			}
 		}
 	}
@@ -154,6 +158,7 @@ void runFormatTest(String prettierVersion, PrettierConfig config, String cleanFi
 			final String cleanFile = FILEDIR + "typescript." + cleanFileNameSuffix + ".clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
+					"PRETTIER_TEST",
 					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -210,6 +215,7 @@ protected void setupTest(API api) {
 			@Override
 			protected FormatterStep create() {
 				return PrettierFormatterStep.create(
+						"PRETTIER_TEST",
 						ImmutableMap.of("prettier", prettierVersion),
 						TestProvisioner.mavenCentral(),
 						projectDir(),

From 4589ca9dcd1d56792296dd6794dd76db59fcd735 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 7 Apr 2025 20:58:51 +0200
Subject: [PATCH 088/210] docs: add node_modules separation 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 7d16300cce..8e2b6ac202 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,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))
+* **BREAKING** Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same, to prevent race conditions when running in parallel. For this, the API of npm-based formatter steps has been changed. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
 
 ## [3.1.0] - 2025-02-20
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5d2cb19742..733d5cf3dc 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 (
 * 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))
+* Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same to prevent race conditions when running in parallel. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 483258c36a..f46eebf703 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 (
 ### 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))
+* Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same to prevent race conditions when running in parallel. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
 
 ## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))

From 215793d2709c546e76f985fd4987506bb9410006 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 7 Apr 2025 22:33:34 +0200
Subject: [PATCH 089/210] docs: apply correct pr number

Refs: #2462
---
 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 8e2b6ac202..fe1e97c286 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
 * 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))
-* **BREAKING** Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same, to prevent race conditions when running in parallel. For this, the API of npm-based formatter steps has been changed. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
+* **BREAKING** Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same, to prevent race conditions when running in parallel. For this, the API of npm-based formatter steps has been changed. ([#2462](https://github.com/diffplug/spotless/pull/2462))
 
 ## [3.1.0] - 2025-02-20
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 733d5cf3dc..c402a1b09b 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 (
 * 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))
-* Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same to prevent race conditions when running in parallel. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
+* Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same to prevent race conditions when running in parallel. ([#2462](https://github.com/diffplug/spotless/pull/2462))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f46eebf703..f9ea744bae 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
 * 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))
-* Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same to prevent race conditions when running in parallel. ([#TODO](https://github.com/diffplug/spotless/pull/TODO))
+* Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same to prevent race conditions when running in parallel. ([#2462](https://github.com/diffplug/spotless/pull/2462))
 
 ## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))

From fe34e9cd07287486b9d544f7c18e11299e6cef67 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 7 Apr 2025 22:41:40 +0200
Subject: [PATCH 090/210] chore: add input validation for formatName

Refs: #2462
---
 .../main/java/com/diffplug/spotless/npm/EslintFormatterStep.java | 1 +
 .../java/com/diffplug/spotless/npm/PrettierFormatterStep.java    | 1 +
 2 files changed, 2 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 d32f4e58b9..2f0f016476 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -69,6 +69,7 @@ public static Map<String, String> defaultDevDependenciesWithEslint(String versio
 	}
 
 	public static FormatterStep create(String formatName, Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
+		requireNonNull(formatName);
 		requireNonNull(devDependencies);
 		requireNonNull(provisioner);
 		requireNonNull(projectDir);
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 0f81934e24..6a79116435 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -52,6 +52,7 @@ public static final Map<String, String> defaultDevDependenciesWithPrettier(Strin
 	}
 
 	public static FormatterStep create(String formatName, Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) {
+		requireNonNull(formatName);
 		requireNonNull(devDependencies);
 		requireNonNull(provisioner);
 		requireNonNull(buildDir);

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 091/210] 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 092/210] 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 093/210] 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 0f500122616c2876245caf3dd9ac1b1e4f3a1784 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 8 Apr 2025 16:09:29 +0200
Subject: [PATCH 094/210] Revert "chore: add input validation for formatName"

This reverts commit fe34e9cd07287486b9d544f7c18e11299e6cef67.
---
 .../main/java/com/diffplug/spotless/npm/EslintFormatterStep.java | 1 -
 .../java/com/diffplug/spotless/npm/PrettierFormatterStep.java    | 1 -
 2 files changed, 2 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 2f0f016476..d32f4e58b9 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/EslintFormatterStep.java
@@ -69,7 +69,6 @@ public static Map<String, String> defaultDevDependenciesWithEslint(String versio
 	}
 
 	public static FormatterStep create(String formatName, Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, EslintConfig eslintConfig) {
-		requireNonNull(formatName);
 		requireNonNull(devDependencies);
 		requireNonNull(provisioner);
 		requireNonNull(projectDir);
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 6a79116435..0f81934e24 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java
@@ -52,7 +52,6 @@ public static final Map<String, String> defaultDevDependenciesWithPrettier(Strin
 	}
 
 	public static FormatterStep create(String formatName, Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, NpmPathResolver npmPathResolver, PrettierConfig prettierConfig) {
-		requireNonNull(formatName);
 		requireNonNull(devDependencies);
 		requireNonNull(provisioner);
 		requireNonNull(buildDir);

From e4b8f30136ec29d75bbe3dde5017b752b4e1cc7e Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 8 Apr 2025 16:09:33 +0200
Subject: [PATCH 095/210] Revert "fix: separate node_modules dir per npm based
 formatter"

This reverts commit da3b75b4cc8e50960d3dbbf2601d1ba4ab9613f1.
---
 .../spotless/npm/EslintFormatterStep.java     |  9 +-
 .../npm/NpmFormatterStepStateBase.java        |  4 +-
 .../spotless/npm/PrettierFormatterStep.java   |  9 +-
 .../gradle/spotless/FormatExtension.java      |  2 +-
 .../gradle/spotless/JavascriptExtension.java  |  4 +-
 .../gradle/spotless/TypescriptExtension.java  |  4 +-
 .../spotless/PrettierIntegrationTest.java     | 91 ++++---------------
 .../spotless/maven/FormatterFactory.java      | 10 +-
 .../spotless/maven/FormatterStepConfig.java   | 10 +-
 .../spotless/maven/FormattersHolder.java      | 13 +--
 .../spotless/maven/generic/Prettier.java      |  4 +-
 .../maven/javascript/AbstractEslint.java      |  4 +-
 .../prettier/PrettierFormatStepTest.java      | 36 +-------
 .../spotless/npm/EslintFormatterStepTest.java |  5 +-
 .../npm/PrettierFormatterStepTest.java        | 10 +-
 15 files changed, 52 insertions(+), 163 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 d32f4e58b9..70beaf91ca 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-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.
@@ -68,14 +68,13 @@ public static Map<String, String> defaultDevDependenciesWithEslint(String versio
 		return Collections.singletonMap("eslint", version);
 	}
 
-	public static FormatterStep create(String formatName, Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, 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);
-		final String prefixedName = String.format("%s-%s", formatName, NAME);
-		return FormatterStep.createLazy(prefixedName,
-				() -> new State(prefixedName, devDependencies, projectDir, buildDir, cacheDir, npmPathResolver, eslintConfig),
+		return FormatterStep.createLazy(NAME,
+				() -> new State(NAME, devDependencies, projectDir, buildDir, cacheDir, npmPathResolver, eslintConfig),
 				State::createFormatterFunc);
 	}
 
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 dd798e6e55..3ec06e0434 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-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.
@@ -69,7 +69,7 @@ public static class Runtime {
 
 		Runtime(NpmFormatterStepStateBase parent) {
 			this.parent = parent;
-			this.nodeServerLayout = new NodeServerLayout(new File(parent.locations.buildDir(), parent.stepName), parent.npmConfig.getPackageJsonContent());
+			this.nodeServerLayout = new NodeServerLayout(parent.locations.buildDir(), parent.npmConfig.getPackageJsonContent());
 			this.nodeServeApp = new NodeServeApp(nodeServerLayout, parent.npmConfig, parent.locations);
 		}
 
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 0f81934e24..27a1002df5 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-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.
@@ -51,13 +51,12 @@ public static final Map<String, String> defaultDevDependenciesWithPrettier(Strin
 		return Collections.singletonMap("prettier", version);
 	}
 
-	public static FormatterStep create(String formatName, Map<String, String> devDependencies, Provisioner provisioner, File projectDir, File buildDir, File cacheDir, 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);
-		final String prefixedName = String.format("%s-%s", formatName, NAME);
-		return FormatterStep.createLazy(prefixedName,
-				() -> new State(prefixedName, devDependencies, projectDir, buildDir, cacheDir, npmPathResolver, prettierConfig),
+		return FormatterStep.createLazy(NAME,
+				() -> new State(NAME, devDependencies, projectDir, buildDir, cacheDir, npmPathResolver, prettierConfig),
 				State::createFormatterFunc);
 	}
 
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 712e6fe00a..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
@@ -798,7 +798,7 @@ public PrettierConfig config(final Map<String, Object> prettierConfig) {
 		@Override
 		protected FormatterStep createStep() {
 			final Project project = getProject();
-			return PrettierFormatterStep.create(formatName(), devDependencies, provisioner(), project.getProjectDir(),
+			return PrettierFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
 					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
 							Arrays.asList(project.getProjectDir(), project.getRootDir())),
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 7968f86e28..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
@@ -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.
@@ -106,7 +106,7 @@ public JavascriptEslintConfig(Map<String, String> devDependencies) {
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
-			return EslintFormatterStep.create(NAME, devDependencies, provisioner(), project.getProjectDir(),
+			return EslintFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
 					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
 							Arrays.asList(project.getProjectDir(), project.getRootDir())),
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 9794a3c349..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
@@ -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.
@@ -214,7 +214,7 @@ public TypescriptEslintConfig tsconfigFile(Object path) {
 		public FormatterStep createStep() {
 			final Project project = getProject();
 
-			return EslintFormatterStep.create(NAME, devDependencies, provisioner(), project.getProjectDir(),
+			return EslintFormatterStep.create(devDependencies, provisioner(), project.getProjectDir(),
 					project.getLayout().getBuildDirectory().getAsFile().get(), npmModulesCacheOrNull(),
 					new NpmPathResolver(npmFileOrNull(), nodeFileOrNull(), npmrcFileOrNull(),
 							Arrays.asList(project.getProjectDir(), project.getRootDir())),
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 6c85949861..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
@@ -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.
@@ -15,18 +15,10 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
+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;
 
@@ -59,7 +51,7 @@ void useInlineConfig(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		switch (prettierVersion) {
 		case PRETTIER_VERSION_2:
 			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
@@ -89,7 +81,7 @@ void verifyCleanSpotlessCheckWorks(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessCheckFailsGracefully = gradleRunner().withArguments("--stacktrace", "spotlessCheck").buildAndFail();
-		assertThat(spotlessCheckFailsGracefully.getOutput()).contains("> The following files had format violations:");
+		Assertions.assertThat(spotlessCheckFailsGracefully.getOutput()).contains("> The following files had format violations:");
 
 		gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		gradleRunner().withArguments("--stacktrace", "spotlessCheck").build();
@@ -112,7 +104,7 @@ void useFileConfig(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		switch (prettierVersion) {
 		case PRETTIER_VERSION_2:
 			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
@@ -139,7 +131,7 @@ void chooseParserBasedOnFilename(String prettierVersion) throws IOException {
 				"}");
 		setFile("dirty.json").toResource("npm/prettier/filename/dirty.json");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("dirty.json").sameAsResource("npm/prettier/filename/clean.json");
 	}
 
@@ -177,7 +169,7 @@ void useJavaCommunityPlugin(String prettierVersion) throws IOException {
 				"}");
 		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
 	}
 
@@ -210,7 +202,7 @@ void useJavaCommunityPluginFileConfig(String prettierVersion) throws IOException
 				"}");
 		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("JavaTest.java").sameAsResource("npm/prettier/plugins/java-test.clean");
 	}
 
@@ -234,8 +226,8 @@ void suggestsMissingJavaCommunityPlugin(String prettierVersion) throws IOExcepti
 				"}");
 		setFile("JavaTest.java").toResource("npm/prettier/plugins/java-test.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		assertThat(spotlessApply.getOutput()).contains("Could not infer a parser");
-		assertThat(spotlessApply.getOutput()).contains("prettier-plugin-java");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("Could not infer a parser");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("prettier-plugin-java");
 	}
 
 	@ParameterizedTest(name = "{index}: usePhpCommunityPlugin with prettier {0}")
@@ -272,7 +264,7 @@ void usePhpCommunityPlugin(String prettierVersion) throws IOException {
 				"}");
 		setFile("php-example.php").toResource("npm/prettier/plugins/php.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("php-example.php").sameAsResource("npm/prettier/plugins/php.clean");
 	}
 
@@ -332,9 +324,9 @@ void usePhpAndJavaCommunityPlugin(String prettierVersion) 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().forwardOutput().withArguments("--stacktrace", "--info", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		final BuildResult spotlessApply2 = gradleRunner().forwardOutput().withArguments("--stacktrace", "--info", "spotlessApply").build();
-		assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
+		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");
 	}
@@ -363,7 +355,7 @@ void autodetectNpmrcFileConfig(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
+		Assertions.assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 
 	@ParameterizedTest(name = "{index}: verifyCleanAndSpotlessWorks with prettier {0}")
@@ -385,9 +377,9 @@ void verifyCleanAndSpotlessWorks(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		final BuildResult spotlessApply2 = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
-		assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
 	}
 
 	@ParameterizedTest(name = "{index}: verifyCleanAndSpotlessWithNpmInstallCacheWorks with prettier {0}")
@@ -409,9 +401,9 @@ void verifyCleanAndSpotlessWithNpmInstallCacheWorks(String prettierVersion) thro
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		final BuildResult spotlessApply2 = gradleRunner().withArguments("--stacktrace", "clean", "spotlessApply").build();
-		assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
+		Assertions.assertThat(spotlessApply2.getOutput()).contains("BUILD SUCCESSFUL");
 	}
 
 	@ParameterizedTest(name = "{index}: autodetectNpmrcFileConfig with prettier {0}")
@@ -438,51 +430,6 @@ void pickupNpmrcFileConfig(String prettierVersion) throws IOException {
 				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").buildAndFail();
-		assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
-	}
-
-	@Test
-	void multiplePrettierSetupsDoNotIntersectOnNpmDir() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"def prettierConfig = [:]",
-				"prettierConfig['printWidth'] = 120",
-				"spotless {",
-				"    format 'mytypescript', {",
-				"        target 'test.ts'",
-				"        prettier().config(prettierConfig)",
-				"    }",
-				"    format 'json', {",
-				"        target 'test.json'",
-				"        prettier().config(prettierConfig)",
-				"    }",
-				"    javascript {",
-				"        target 'test.js'",
-				"        prettier().config(prettierConfig)",
-				"    }",
-				"}");
-
-		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		setFile("test.json").toResource("npm/prettier/filetypes/json/json.dirty");
-		setFile("test.js").toResource("npm/prettier/filetypes/javascript-es5/javascript-es5.dirty");
-
-		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
-		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-
-		File buildFolder = new File(rootFolder(), "build");
-		assertThat(buildFolder).isNotEmptyDirectory();
-
-		// verify it contains 3 folders containing "spotless-prettier" in it (recursively) - one for each format
-		try (Stream<Path> pathStream = Files.walk(buildFolder.toPath())) {
-			List<Path> nodeModulesDirs = pathStream
-					.sorted()
-					.filter(Files::isDirectory)
-					.filter(path -> path.getFileName().toString().contains("spotless-prettier"))
-					.collect(Collectors.toList());
-			assertThat(nodeModulesDirs).hasSize(3);
-		}
+		Assertions.assertThat(spotlessApply.getOutput()).containsPattern("Running npm command.*npm install.* failed with exit code: 1");
 	}
 }
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 541d7385eb..456c31b9a3 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-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.
@@ -83,12 +83,12 @@ public final Set<String> excludes() {
 		return excludes == null ? emptySet() : Sets.newHashSet(excludes);
 	}
 
-	public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, FormatterConfig config, int formatterIndex) {
+	public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, FormatterConfig config) {
 		Charset formatterEncoding = encoding(config);
 		LineEnding formatterLineEndings = lineEndings(config);
 		LineEnding.Policy formatterLineEndingPolicy = formatterLineEndings.createPolicy(config.getFileLocator().getBaseDir(), filesToFormat);
 
-		FormatterStepConfig stepConfig = stepConfig(formatterEncoding, config, formatterIndex);
+		FormatterStepConfig stepConfig = stepConfig(formatterEncoding, config);
 		List<FormatterStepFactory> factories = gatherStepFactories(config.getGlobalStepFactories(), stepFactories);
 
 		List<FormatterStep> formatterSteps = factories.stream()
@@ -174,8 +174,8 @@ Optional<String> ratchetFrom(FormatterConfig config) {
 		}
 	}
 
-	private FormatterStepConfig stepConfig(Charset encoding, FormatterConfig config, int formatterIndex) {
-		return new FormatterStepConfig(encoding, licenseHeaderDelimiter(), ratchetFrom(config), config.getProvisioner(), config.getFileLocator(), config.getSpotlessSetLicenseHeaderYearsFromGitHistory(), String.format("%s-%d", "formatter", formatterIndex));
+	private FormatterStepConfig stepConfig(Charset encoding, FormatterConfig config) {
+		return new FormatterStepConfig(encoding, licenseHeaderDelimiter(), ratchetFrom(config), config.getProvisioner(), config.getFileLocator(), config.getSpotlessSetLicenseHeaderYearsFromGitHistory());
 	}
 
 	private static List<FormatterStepFactory> gatherStepFactories(List<FormatterStepFactory> allGlobal, List<FormatterStepFactory> allConfigured) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepConfig.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepConfig.java
index ecaad55446..a1f2e52b41 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepConfig.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterStepConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * 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.
@@ -28,16 +28,14 @@ public class FormatterStepConfig {
 	private final Provisioner provisioner;
 	private final FileLocator fileLocator;
 	private final Optional<String> spotlessSetLicenseHeaderYearsFromGitHistory;
-	private final String name;
 
-	public FormatterStepConfig(Charset encoding, String licenseHeaderDelimiter, Optional<String> ratchetFrom, Provisioner provisioner, FileLocator fileLocator, Optional<String> spotlessSetLicenseHeaderYearsFromGitHistory, String name) {
+	public FormatterStepConfig(Charset encoding, String licenseHeaderDelimiter, Optional<String> ratchetFrom, Provisioner provisioner, FileLocator fileLocator, Optional<String> spotlessSetLicenseHeaderYearsFromGitHistory) {
 		this.encoding = encoding;
 		this.licenseHeaderDelimiter = licenseHeaderDelimiter;
 		this.ratchetFrom = ratchetFrom;
 		this.provisioner = provisioner;
 		this.fileLocator = fileLocator;
 		this.spotlessSetLicenseHeaderYearsFromGitHistory = spotlessSetLicenseHeaderYearsFromGitHistory;
-		this.name = name;
 	}
 
 	public Charset getEncoding() {
@@ -63,8 +61,4 @@ public FileLocator getFileLocator() {
 	public Optional<String> spotlessSetLicenseHeaderYearsFromGitHistory() {
 		return spotlessSetLicenseHeaderYearsFromGitHistory;
 	}
-
-	public String getName() {
-		return name;
-	}
 }
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 dea60739db..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-2025 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,14 +16,11 @@
 package com.diffplug.spotless.maven;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import com.diffplug.spotless.Formatter;
 
@@ -43,16 +40,12 @@ public String nameFor(FormatterFactory factory) {
 	static FormattersHolder create(Map<FormatterFactory, Supplier<Iterable<File>>> formatterFactoryToFiles, FormatterConfig config) {
 		Map<FormatterFactory, Formatter> openFormatters = new LinkedHashMap<>();
 		try {
-			List<Entry<FormatterFactory, Supplier<Iterable<File>>>> formatterEntries = new ArrayList<>(formatterFactoryToFiles.entrySet());
-			for (int formatterIndex = 0; formatterIndex < formatterEntries.size(); formatterIndex++) {
-				Entry<FormatterFactory, Supplier<Iterable<File>>> entry = formatterEntries.get(formatterIndex);
+			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, formatterIndex);
+				Formatter formatter = formatterFactory.newFormatter(files, config);
 				openFormatters.put(formatterFactory, formatter);
 			}
-
-			System.out.println("Created formatters: " + openFormatters.keySet().stream().map(f -> f.includes()).collect(Collectors.toList()));
 		} catch (RuntimeException openError) {
 			try {
 				close(openFormatters.values());
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 f747f8764a..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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 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.
@@ -103,7 +103,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		File cacheDir = cacheDir(stepConfig);
 		PrettierConfig prettierConfig = new PrettierConfig(configFileHandler, configInline);
 		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
-		return PrettierFormatterStep.create(stepConfig.getName(), devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, cacheDir, 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 2b85cdcebc..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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 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.
@@ -69,7 +69,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		File baseDir = baseDir(stepConfig);
 		File cacheDir = cacheDir(stepConfig);
 		NpmPathResolver npmPathResolver = npmPathResolver(stepConfig);
-		return EslintFormatterStep.create(stepConfig.getName(), devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, cacheDir, 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/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java
index f5f5bddccd..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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 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,13 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 
@@ -164,34 +158,6 @@ void multiple_prettier_configs() throws Exception {
 
 	}
 
-	/**
-	 * This test is to ensure that we can have multiple equivalent prettier instances in one spotless config.
-	 */
-	@Test
-	void multiple_equivalent_prettier_configs_do_not_intersect() throws Exception {
-		writePom(
-				formats(
-						groupWithSteps("myjson", including("test.json"),
-								"<prettier>",
-								"</prettier>"),
-						groupWithSteps("myts", including("test.ts"),
-								"<prettier>",
-								"</prettier>")));
-
-		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
-		setFile("test.json").toResource("npm/prettier/filetypes/json/json.dirty");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-
-		// check that each prettier instance has its own node_modules directory
-		File targetDir = new File(rootFolder(), "target");
-		try (Stream<Path> files = Files.walk(targetDir.toPath())) {
-			List<Path> prettierFolders = files.filter(Files::isDirectory)
-					.filter(path -> path.getFileName().toString().contains("spotless-prettier"))
-					.collect(Collectors.toList());
-			assertThat(prettierFolders).hasSize(2); // one for each prettier instance
-		}
-	}
-
 	@Test
 	void custom_plugin() throws Exception {
 		writePomWithFormatSteps(
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 6b8debedfb..da00e37d35 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-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.
@@ -58,7 +58,6 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			final String cleanFile = filedir + "javascript-es6.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
-					"ESLINT_TEST",
 					devDependenciesForRuleset.get(ruleSetName),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -101,7 +100,6 @@ void formattingUsingRulesetsFile(String ruleSetName) throws Exception {
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
-					"ESLINT_TEST",
 					devDependenciesForRuleset.get(ruleSetName),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -159,7 +157,6 @@ void formattingUsingInlineXoConfig() throws Exception {
 			final String cleanFile = filedir + "typescript.clean";
 
 			final FormatterStep formatterStep = EslintFormatterStep.create(
-					"ESLINT_TEST",
 					EslintStyleGuide.TS_XO_TYPESCRIPT.mergedWith(EslintFormatterStep.defaultDevDependenciesForTypescript()),
 					TestProvisioner.mavenCentral(),
 					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 915d757d33..54ce09e7e8 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-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.
@@ -63,7 +63,6 @@ private void runTestUsingPrettier(String fileType, Map<String, String> dependenc
 			final String cleanFile = filedir + fileType + ".clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					"PRETTIER_TEST",
 					dependencies,
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -91,7 +90,6 @@ void parserInferenceBasedOnExplicitFilepathIsWorking(String prettierVersion) thr
 			final String cleanFile = filedir + "json.clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					"PRETTIER_TEST",
 					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -114,7 +112,6 @@ void parserInferenceBasedOnFilenameIsWorking(String prettierVersion) throws Exce
 			final String cleanFile = filedir + "clean.json";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					"PRETTIER_TEST",
 					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -131,7 +128,6 @@ void parserInferenceBasedOnFilenameIsWorking(String prettierVersion) throws Exce
 		@Test
 		void verifyPrettierErrorMessageIsRelayed() throws Exception {
 			FormatterStep formatterStep = PrettierFormatterStep.create(
-					"PRETTIER_TEST",
 					PrettierFormatterStep.defaultDevDependenciesWithPrettier("2.8.8"),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -141,7 +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("LINE_UNDEFINED PRETTIER_TEST-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\") (...)");
+						.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\") (...)");
 			}
 		}
 	}
@@ -158,7 +154,6 @@ void runFormatTest(String prettierVersion, PrettierConfig config, String cleanFi
 			final String cleanFile = FILEDIR + "typescript." + cleanFileNameSuffix + ".clean";
 
 			final FormatterStep formatterStep = PrettierFormatterStep.create(
-					"PRETTIER_TEST",
 					ImmutableMap.of("prettier", prettierVersion),
 					TestProvisioner.mavenCentral(),
 					projectDir(),
@@ -215,7 +210,6 @@ protected void setupTest(API api) {
 			@Override
 			protected FormatterStep create() {
 				return PrettierFormatterStep.create(
-						"PRETTIER_TEST",
 						ImmutableMap.of("prettier", prettierVersion),
 						TestProvisioner.mavenCentral(),
 						projectDir(),

From 2466e47b6afed1a1bbd7389a4752062d4f692c24 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 8 Apr 2025 16:37:38 +0200
Subject: [PATCH 096/210] fix: make sure node_modules dir is exclusively
 created

Refs: #2462
---
 .../spotless/npm/ExclusiveFolderAccess.java   | 67 +++++++++++++++++++
 .../npm/NpmFormatterStepStateBase.java        | 21 +++---
 2 files changed, 79 insertions(+), 9 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/npm/ExclusiveFolderAccess.java

diff --git a/lib/src/main/java/com/diffplug/spotless/npm/ExclusiveFolderAccess.java b/lib/src/main/java/com/diffplug/spotless/npm/ExclusiveFolderAccess.java
new file mode 100644
index 0000000000..f36fcbb8b4
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/npm/ExclusiveFolderAccess.java
@@ -0,0 +1,67 @@
+/*
+ * 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.npm;
+
+import java.io.File;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import javax.annotation.Nonnull;
+
+import com.diffplug.spotless.ThrowingEx;
+
+interface ExclusiveFolderAccess {
+
+	static ExclusiveFolderAccess forFolder(@Nonnull File folder) {
+		return forFolder(folder.getAbsolutePath());
+	}
+
+	static ExclusiveFolderAccess forFolder(@Nonnull String path) {
+		return new ExclusiveFolderAccessSharedMutex(Objects.requireNonNull(path));
+	}
+
+	void runExclusively(ThrowingEx.Runnable runnable);
+
+	class ExclusiveFolderAccessSharedMutex implements ExclusiveFolderAccess {
+
+		private static final ConcurrentHashMap<String, Lock> mutexes = new ConcurrentHashMap<>();
+
+		private final String path;
+
+		private ExclusiveFolderAccessSharedMutex(@Nonnull String path) {
+			this.path = Objects.requireNonNull(path);
+		}
+
+		private Lock getMutex() {
+			return mutexes.computeIfAbsent(path, k -> new ReentrantLock());
+		}
+
+		@Override
+		public void runExclusively(ThrowingEx.Runnable runnable) {
+			final Lock lock = getMutex();
+			try {
+				lock.lock();
+				runnable.run();
+			} catch (Exception e) {
+				throw ThrowingEx.asRuntime(e);
+			} finally {
+				lock.unlock();
+			}
+		}
+	}
+}
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 3ec06e0434..eeb70b96c4 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-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.
@@ -87,14 +87,17 @@ protected void prepareNodeServer() throws IOException {
 		}
 
 		protected void assertNodeServerDirReady() throws IOException {
-			if (needsPrepareNodeServerLayout()) {
-				// reinstall if missing
-				prepareNodeServerLayout();
-			}
-			if (needsPrepareNodeServer()) {
-				// run npm install if node_modules is missing
-				prepareNodeServer();
-			}
+			ExclusiveFolderAccess.forFolder(nodeServerLayout.nodeModulesDir())
+					.runExclusively(() -> {
+						if (needsPrepareNodeServerLayout()) {
+							// reinstall if missing
+							prepareNodeServerLayout();
+						}
+						if (needsPrepareNodeServer()) {
+							// run npm install if node_modules is missing
+							prepareNodeServer();
+						}
+					});
 		}
 
 		protected boolean needsPrepareNodeServer() {

From 1f50067b5068eb130b9145b573110e9fb811a806 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 8 Apr 2025 17:46:59 +0200
Subject: [PATCH 097/210] feat: allow process to be started using instance_id

to be able to launch multiple instances of npm in the same node_modules
dir.

Refs: #2462
---
 .../NodeModulesCachingNpmProcessFactory.java  |  7 +++--
 .../diffplug/spotless/npm/NodeServeApp.java   |  8 +++--
 .../npm/NpmFormatterStepStateBase.java        |  8 +++--
 .../spotless/npm/NpmProcessFactory.java       |  6 ++--
 .../npm/StandardNpmProcessFactory.java        | 16 ++++++----
 .../com/diffplug/spotless/npm/common-serve.js | 30 +++++++++++++++----
 6 files changed, 54 insertions(+), 21 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 2f1addf2af..a821dd6b8e 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-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.
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 import javax.annotation.Nonnull;
 
@@ -65,8 +66,8 @@ public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, Npm
 	}
 
 	@Override
-	public NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
-		return StandardNpmProcessFactory.INSTANCE.createNpmServeProcess(nodeServerLayout, formatterStepLocations);
+	public NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations, UUID nodeServerInstanceId) {
+		return StandardNpmProcessFactory.INSTANCE.createNpmServeProcess(nodeServerLayout, formatterStepLocations, nodeServerInstanceId);
 	}
 
 	private class CachingNmpInstall implements NpmProcess {
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 c9311a5589..3e2efd43e8 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NodeServeApp.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.
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.npm;
 
+import java.util.UUID;
+
 import javax.annotation.Nonnull;
 
 import org.slf4j.Logger;
@@ -32,9 +34,9 @@ public NodeServeApp(@Nonnull NodeServerLayout nodeServerLayout, @Nonnull NpmConf
 		super(nodeServerLayout, npmConfig, formatterStepLocations);
 	}
 
-	ProcessRunner.LongRunningProcess startNpmServeProcess() {
+	ProcessRunner.LongRunningProcess startNpmServeProcess(UUID nodeServerInstanceId) {
 		return timedLogger.withInfo("Starting npm based server in {} with {}.", this.nodeServerLayout.nodeModulesDir(), this.npmProcessFactory.describe())
-				.call(() -> npmProcessFactory.createNpmServeProcess(nodeServerLayout, formatterStepLocations).start());
+				.call(() -> npmProcessFactory.createNpmServeProcess(nodeServerLayout, formatterStepLocations, nodeServerInstanceId).start());
 	}
 
 }
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 eeb70b96c4..71eba3594b 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -25,6 +25,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -112,12 +113,13 @@ protected ServerProcessInfo npmRunServer() throws ServerStartException, IOExcept
 			assertNodeServerDirReady();
 			LongRunningProcess server = null;
 			try {
-				// The npm process will output the randomly selected port of the http server process to 'server.port' file
+				final UUID nodeServerInstanceId = UUID.randomUUID();
+				// The npm process will output the randomly selected port of the http server process to 'server-<id>.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");
+				final File serverPortFile = new File(this.nodeServerLayout.nodeModulesDir(), String.format("server-%s.port", nodeServerInstanceId));
 				NpmResourceHelper.deleteFileIfExists(serverPortFile);
 				// start the http server in node
-				server = nodeServeApp.startNpmServeProcess();
+				server = nodeServeApp.startNpmServeProcess(nodeServerInstanceId);
 
 				// 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/NpmProcessFactory.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
index dbc9a807d5..4b3edee462 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmProcessFactory.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.
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.npm;
 
+import java.util.UUID;
+
 public interface NpmProcessFactory {
 
 	enum OnlinePreferrence {
@@ -33,7 +35,7 @@ public String option() {
 
 	NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations, OnlinePreferrence onlinePreferrence);
 
-	NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations);
+	NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations, UUID nodeServerInstanceId);
 
 	default String describe() {
 		return getClass().getSimpleName();
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 91cf80ad69..b9abd03029 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/StandardNpmProcessFactory.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.
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
 import com.diffplug.spotless.ProcessRunner;
@@ -37,8 +38,8 @@ public NpmProcess createNpmInstallProcess(NodeServerLayout nodeServerLayout, Npm
 	}
 
 	@Override
-	public NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations) {
-		return new NpmServe(nodeServerLayout.nodeModulesDir(), formatterStepLocations);
+	public NpmLongRunningProcess createNpmServeProcess(NodeServerLayout nodeServerLayout, NpmFormatterStepLocations formatterStepLocations, UUID nodeServerInstanceId) {
+		return new NpmServe(nodeServerLayout.nodeModulesDir(), formatterStepLocations, nodeServerInstanceId);
 	}
 
 	private static abstract class AbstractStandardNpmProcess {
@@ -119,8 +120,11 @@ public ProcessRunner.Result waitFor() {
 
 	private static class NpmServe extends AbstractStandardNpmProcess implements NpmLongRunningProcess {
 
-		public NpmServe(File workingDir, NpmFormatterStepLocations formatterStepLocations) {
+		private final UUID nodeServerInstanceId;
+
+		public NpmServe(File workingDir, NpmFormatterStepLocations formatterStepLocations, UUID nodeServerInstanceId) {
 			super(workingDir, formatterStepLocations);
+			this.nodeServerInstanceId = nodeServerInstanceId;
 		}
 
 		@Override
@@ -128,7 +132,9 @@ protected List<String> commandLine() {
 			return List.of(
 					npmExecutable(),
 					"start",
-					"--scripts-prepend-node-path=true");
+					"--scripts-prepend-node-path=true",
+					"--",
+					"--node-server-instance-id=" + nodeServerInstanceId);
 		}
 
 		@Override
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 c1c9d62757..5bfcb35612 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
@@ -4,7 +4,7 @@ const GracefulShutdownManager = require("@moebius/http-graceful-shutdown").Grace
 const express = require("express");
 const app = express();
 
-app.use(express.json({ limit: "50mb" }));
+app.use(express.json({limit: "50mb"}));
 
 const fs = require("fs");
 
@@ -14,13 +14,33 @@ function debugLog() {
 	}
 }
 
+function getInstanceId() {
+	const args = process.argv.slice(2);
+
+	// Look for the --node-server-instance-id option
+	let instanceId;
+
+	args.forEach(arg => {
+		if (arg.startsWith('--node-server-instance-id=')) {
+			instanceId = arg.split('=')[1];
+		}
+	});
+
+	// throw if instanceId is not set
+	if (!instanceId) {
+		throw new Error("Missing --node-server-instance-id argument");
+	}
+	return instanceId;
+}
+
 var listener = app.listen(0, "127.0.0.1", () => {
-	debugLog("Server running on port " + listener.address().port);
-	fs.writeFile("server.port.tmp", "" + listener.address().port, function(err) {
+	const instanceId = getInstanceId();
+	debugLog("Server running on port " + listener.address().port + " for instance " + instanceId);
+	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) {
+			fs.rename("server.port.tmp", `server-${instanceId}.port`, function (err) {
 				if (err) {
 					return console.log(err);
 				}
@@ -32,7 +52,7 @@ const shutdownManager = new GracefulShutdownManager(listener);
 
 app.post("/shutdown", (req, res) => {
 	res.status(200).send("Shutting down");
-	setTimeout(function() {
+	setTimeout(function () {
 		shutdownManager.terminate(() => debugLog("graceful shutdown finished."));
 	}, 200);
 });

From 01f4dedc2ddfd4f393b41ba7aa94436bb3952c0b Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 8 Apr 2025 22:33:46 +0200
Subject: [PATCH 098/210] chore: add more logging to server starting

---
 .../diffplug/spotless/npm/NpmFormatterStepStateBase.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 71eba3594b..6c4ddc0098 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -33,6 +33,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
 import com.diffplug.spotless.ThrowingEx;
 
@@ -129,10 +130,12 @@ protected ServerProcessInfo npmRunServer() throws ServerStartException, IOExcept
 					try {
 						if (server.isAlive()) {
 							server.destroyForcibly();
-							server.waitFor();
+							ProcessRunner.Result result = server.result();
+							logger.info("Launching npm server process failed. Process result:\n{}", result);
 						}
 					} catch (Throwable t) {
-						// ignore
+						ProcessRunner.Result result = server != null ? ThrowingEx.get(server::result) : null;
+						logger.debug("Unable to forcibly end the server process. Process result:\n{}", result, t);
 					}
 					throw timeoutException;
 				}

From 65b4e0869d51ef89844f11c24c9f70ed79b23a8e Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 8 Apr 2025 22:42:29 +0200
Subject: [PATCH 099/210] docs: adapt CHANGES.md files to new approach

before: make sure every formatter uses its own node_modules dir.
now: actively support using same node_modules dir for multiple
formatters

Refs: #2462
---
 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 fe1e97c286..6b2092441d 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
 * 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))
-* **BREAKING** Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same, to prevent race conditions when running in parallel. For this, the API of npm-based formatter steps has been changed. ([#2462](https://github.com/diffplug/spotless/pull/2462))
+* Allow multiple npm-based formatters having the same module dependencies, to share a `node_modules` dir without race conditions. [#2462](https://github.com/diffplug/spotless/pull/2462))
 
 ## [3.1.0] - 2025-02-20
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c402a1b09b..25bfbdef92 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 (
 * 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))
-* Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same to prevent race conditions when running in parallel. ([#2462](https://github.com/diffplug/spotless/pull/2462))
+* Allow multiple npm-based formatters having the same module dependencies, to share a `node_modules` dir without race conditions. [#2462](https://github.com/diffplug/spotless/pull/2462))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f9ea744bae..38402fc5ad 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
 * 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))
-* Assert that each npm-based step uses its own `node_modules` directory, even when configured exactly the same to prevent race conditions when running in parallel. ([#2462](https://github.com/diffplug/spotless/pull/2462))
+* Allow multiple npm-based formatters having the same module dependencies, to share a `node_modules` dir without race conditions. [#2462](https://github.com/diffplug/spotless/pull/2462))
 
 ## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))

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 100/210] 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

From 279372b1c35bb9cc0c1bf3ed545ec00c8d82c7b0 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 9 Apr 2025 05:57:42 +0200
Subject: [PATCH 101/210] fix: spotbugs issue

---
 .../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 6c4ddc0098..9b37533880 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -134,7 +134,7 @@ protected ServerProcessInfo npmRunServer() throws ServerStartException, IOExcept
 							logger.info("Launching npm server process failed. Process result:\n{}", result);
 						}
 					} catch (Throwable t) {
-						ProcessRunner.Result result = server != null ? ThrowingEx.get(server::result) : null;
+						ProcessRunner.Result result = ThrowingEx.get(server::result);
 						logger.debug("Unable to forcibly end the server process. Process result:\n{}", result, t);
 					}
 					throw timeoutException;

From 53c8b14ad29ab3be13958e47920da3b40ff7f908 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 102/210] chore(deps): update plugin com.diffplug.spotless to
 v7.0.3 (#2463)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 CHANGES.md                                                  | 2 ++
 .../spotless/extra/groovy/GrEclipseFormatterStep.java       | 6 ++++--
 .../spotless/extra/java/EclipseJdtFormatterStep.java        | 2 +-
 plugin-gradle/CHANGES.md                                    | 2 ++
 plugin-maven/CHANGES.md                                     | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0a043ffa24..8fb22e5561 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,8 @@ 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))
+* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
+* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [3.1.0] - 2025-02-20
 ### Added
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java
index 4e35dceac5..4ca2b60c03 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.35");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
@@ -69,6 +69,8 @@ protected P2Model model(String version) {
 				model.addFilterAndValidate("no-debug", filter -> {
 					filter.exclude("org.eclipse.jdt.debug");
 				});
+				// work around https://github.com/groovy/groovy-eclipse/issues/1617
+				model.useMavenCentral = false;
 				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 396065d69a..87c7e7fbbd 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
@@ -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.34");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.35");
 
 	public static String defaultVersion() {
 		return JVM_SUPPORT.getRecommendedFormatterVersion();
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 1ddd31cc52..a559d51c14 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 (
 * 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))
+* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
+* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index abf33d63fb..078d882ed6 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 (
 ### 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))
+* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
+* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))

From 5782dda8442eb6e71b969d6c11d636e8f5f59626 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 12 Apr 2025 09:15:38 +0800
Subject: [PATCH 103/210] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.12.2 (#2466)

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 10de201dab..a6d9cd7322 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.1
+VER_JUNIT=5.12.2
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.17.0
 VER_SELFIE=2.4.2
\ No newline at end of file

From a175c94edf9adc0ddc68bb8ac56aee99ed39bf16 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:35:37 +0800
Subject: [PATCH 104/210] chore(deps): update plugin com.github.spotbugs to
 v6.1.9 (#2469)

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 eb1c77e4ee..b8ec265996 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.7' apply false
+	id 'com.github.spotbugs' version '6.1.9' 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 934b01b50d42b0543c307b46b5920c15417fc484 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.211>
Date: Thu, 24 Apr 2025 22:54:33 -0700
Subject: [PATCH 105/210] Update changelogs to account for what has already
 been released.

---
 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 8fb22e5561..671a5b2c9a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,13 +10,14 @@ 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 `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
+* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [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))
-* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
-* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [3.1.0] - 2025-02-20
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a559d51c14..5fb879f611 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,14 +3,15 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changed
+* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
+* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [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))
 * Apply Gradle's strict plugin types validation to the Spotless plugin. ([#2454](https://github.com/diffplug/spotless/pull/2454))
-* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
-* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [7.0.2] - 2025-01-14
 ### Fixed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 078d882ed6..b3e9d89b70 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]
+### Changed
+* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
+* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [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))
-* Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
-* Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 
 ## [2.44.3] - 2025-02-20
 * Support for `clang-format` ([#2406](https://github.com/diffplug/spotless/pull/2406))

From bdafb759b50a65dcbcf182fa05e15d8e7c78e371 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 25 Apr 2025 14:13:48 +0000
Subject: [PATCH 106/210] chore(deps): update dependency gradle to v8.14

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43705 -> 43764 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   4 ++--
 gradlew.bat                              |   4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644
GIT binary patch
delta 642
zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|**
z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$
z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O%
zFic^X{7^$?^Ho04eona9<j-?s7{5&pn3vAfATT*_p3LN00ny11Rtil1HBXAkTNo_F
zzkq$Rzpyk|IAy*RlYkgpSVT+(EPNd(yipP=9LB_`2v^ayz>n#mGMxKhA=~8B%JN`M
zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n
zVkxF2rjrjWR+_xr6e6@_u@s~2<o%12m_J)HOm?uBn*82c8LYT)i4=33JxI(O%zp{w
z$2u}hws-UZ^W&CEF->uv{9vi*<o>1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v
z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^
z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK
I1x7am0No)LiU0rr

delta 584
zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe
z+ES)HSrVnWLtJ&)lO<X$;;LdIOT<1FeJo;R2=Hd-$lYjX>%hRkV9zl5qqWRt0e;bb
zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ
zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT
z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR
z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN
zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N
z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b
zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts
AA^-pY

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c8..ca025c83a7 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index faf93008b7..23d15a9367 100755
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9d21a21834..db3a6ac207 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From 395a79a81de1ab6b1bea535955062c81a47dc522 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 27 Apr 2025 14:36:05 +0800
Subject: [PATCH 107/210] chore(deps): update plugin com.github.spotbugs to
 v6.1.10 (#2472)

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 b8ec265996..d97aad8fbd 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.9' apply false
+	id 'com.github.spotbugs' version '6.1.10' 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 fca3e976ff94b5f0b63e4061940338ca5ec9671c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 8 May 2025 03:27:07 +0000
Subject: [PATCH 108/210] chore(deps): update plugin com.github.spotbugs to
 v6.1.11

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

diff --git a/settings.gradle b/settings.gradle
index d97aad8fbd..c9a39b7575 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.10' apply false
+	id 'com.github.spotbugs' version '6.1.11' 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 278a6b80e61f054d3d365758054b8ba00c8eeb79 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 May 2025 11:14:27 +0800
Subject: [PATCH 109/210] fix(deps): update dependency org.mockito:mockito-core
 to v5.18.0 (#2484)

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 a6d9cd7322..5f1f66046f 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.2
 VER_ASSERTJ=3.27.3
-VER_MOCKITO=5.17.0
+VER_MOCKITO=5.18.0
 VER_SELFIE=2.4.2
\ No newline at end of file

From a386ff052fb26498e65dc1347635250ddf57c141 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 May 2025 03:17:36 +0000
Subject: [PATCH 110/210] chore(deps): update plugin com.github.spotbugs to
 v6.1.12

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

diff --git a/settings.gradle b/settings.gradle
index c9a39b7575..4108bfc731 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.11' apply false
+	id 'com.github.spotbugs' version '6.1.12' 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 606bb69d9a85ae5b0e22ca767097fcf3b2f4d221 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 May 2025 05:15:18 +0000
Subject: [PATCH 111/210] fix(deps): update ver_selfie to v2.5.3

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

diff --git a/gradle.properties b/gradle.properties
index 5f1f66046f..76cc1ce483 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ VER_JGIT=6.10.0.202406032230-r
 VER_JUNIT=5.12.2
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.18.0
-VER_SELFIE=2.4.2
\ No newline at end of file
+VER_SELFIE=2.5.3
\ No newline at end of file

From ef87827b9c584eb5484d84c07ab4b73c82c1b995 Mon Sep 17 00:00:00 2001
From: Robert Stupp <snazy@snazy.de>
Date: Wed, 21 May 2025 12:03:31 +0200
Subject: [PATCH 112/210] fix(FormatExtension/Gradle): Fix step setup with
 `toggleFence` and `targetExcludeContentPattern`

With a non-null `toggleFence`, `com.diffplug.gradle.spotless.FormatExtension#setupTask` creates a new `List` via `List.of()`. Also having a non-null `targetExcludeContentPattern` leads to an `UnsupportedOperationException` thrown by `List.replaceAll`, because `List.of` yields an immutable list.

Change includes (integeration) tests.
---
 .../gradle/spotless/FormatExtension.java      |  4 +-
 .../spotless/JavaDefaultTargetTest.java       | 52 +++++++++++++++++++
 .../targetExclude/TargetExcludeMatch.test     |  4 ++
 .../TargetExcludeNoMatchFormatted.test        |  4 ++
 .../TargetExcludeNoMatchUnformatted.test      |  3 ++
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 testlib/src/main/resources/java/targetExclude/TargetExcludeMatch.test
 create mode 100644 testlib/src/main/resources/java/targetExclude/TargetExcludeNoMatchFormatted.test
 create mode 100644 testlib/src/main/resources/java/targetExclude/TargetExcludeNoMatchUnformatted.test

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..40069850c5 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
@@ -1061,7 +1061,9 @@ protected void setupTask(SpotlessTask task) {
 		task.setTarget(totalTarget);
 		List<FormatterStep> steps;
 		if (toggleFence != null) {
-			steps = List.of(toggleFence.preserveWithin(this.steps));
+			// need a mutable List, 'steps' is mutated by 'steps.replaceAll()' below
+			steps = new ArrayList<>();
+			steps.add(toggleFence.preserveWithin(this.steps));
 		} else {
 			steps = this.steps;
 		}
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 eed4cf1a4d..94143b1a3d 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
@@ -80,4 +80,56 @@ void removeUnusedImportsWithCleanthat() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/java/test.java").sameAsResource("java/removeunusedimports/Jdk17TextBlockFormatted.test");
 	}
+
+	/**
+	 * Triggers the special case in {@link FormatExtension#setupTask(SpotlessTask)} with {@code toggleFence} and
+	 * {@code targetExcludeContentPattern} both being not {@code null}.
+	 */
+	@Test
+	void fenceWithTargetExcludeNoMatch() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"  id 'java'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"  java {" +
+				"    licenseHeader('// my-copyright')",
+				"    toggleOffOn()",
+				"    targetExcludeIfContentContains('excludeMe')",
+				"  }",
+				"}");
+
+		setFile("src/main/java/test.java").toResource("java/targetExclude/TargetExcludeNoMatchUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/java/test.java").sameAsResource("java/targetExclude/TargetExcludeNoMatchFormatted.test");
+	}
+
+	/**
+	 * Triggers the special case in {@link FormatExtension#setupTask(SpotlessTask)} with {@code toggleFence} and
+	 * {@code targetExcludeContentPattern} both being not {@code null}.
+	 */
+	@Test
+	void fenceWithTargetExcludeMatch() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"  id 'com.diffplug.spotless'",
+				"  id 'java'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"  java {" +
+				"    licenseHeader('// my-copyright')",
+				"    toggleOffOn()",
+				"    targetExcludeIfContentContains('excludeMe')",
+				"  }",
+				"}");
+
+		setFile("src/main/java/test.java").toResource("java/targetExclude/TargetExcludeMatch.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/java/test.java").sameAsResource("java/targetExclude/TargetExcludeMatch.test");
+	}
 }
diff --git a/testlib/src/main/resources/java/targetExclude/TargetExcludeMatch.test b/testlib/src/main/resources/java/targetExclude/TargetExcludeMatch.test
new file mode 100644
index 0000000000..f2483a2da9
--- /dev/null
+++ b/testlib/src/main/resources/java/targetExclude/TargetExcludeMatch.test
@@ -0,0 +1,4 @@
+// excludeMe
+import foo.Bar;
+
+class Bar {}
diff --git a/testlib/src/main/resources/java/targetExclude/TargetExcludeNoMatchFormatted.test b/testlib/src/main/resources/java/targetExclude/TargetExcludeNoMatchFormatted.test
new file mode 100644
index 0000000000..f39cd3e44d
--- /dev/null
+++ b/testlib/src/main/resources/java/targetExclude/TargetExcludeNoMatchFormatted.test
@@ -0,0 +1,4 @@
+// my-copyright
+import foo.Bar;
+
+class Bar {}
diff --git a/testlib/src/main/resources/java/targetExclude/TargetExcludeNoMatchUnformatted.test b/testlib/src/main/resources/java/targetExclude/TargetExcludeNoMatchUnformatted.test
new file mode 100644
index 0000000000..fe328fe0fe
--- /dev/null
+++ b/testlib/src/main/resources/java/targetExclude/TargetExcludeNoMatchUnformatted.test
@@ -0,0 +1,3 @@
+import foo.Bar;
+
+class Bar {}

From 0e1f582f5eea27302b7c4f8b2f2c189827aa4d15 Mon Sep 17 00:00:00 2001
From: Robert Stupp <snazy@snazy.de>
Date: Wed, 21 May 2025 12:28:22 +0200
Subject: [PATCH 113/210] changelog

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

diff --git a/CHANGES.md b/CHANGES.md
index 92f84983f5..88a084a365 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 `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d4658c1f8f..c26d0f6032 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 `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))

From 0d62d758f980ba1da72cd969a93963030d18de0e Mon Sep 17 00:00:00 2001
From: Robert Stupp <snazy@snazy.de>
Date: Wed, 21 May 2025 17:00:14 +0200
Subject: [PATCH 114/210] fix spotlessCheck/Apply

---
 .../com/diffplug/gradle/spotless/JavaDefaultTargetTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 94143b1a3d..a244de372e 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-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.
@@ -95,7 +95,7 @@ void fenceWithTargetExcludeNoMatch() throws Exception {
 				"repositories { mavenCentral() }",
 				"",
 				"spotless {",
-				"  java {" +
+				"  java {",
 				"    licenseHeader('// my-copyright')",
 				"    toggleOffOn()",
 				"    targetExcludeIfContentContains('excludeMe')",
@@ -121,7 +121,7 @@ void fenceWithTargetExcludeMatch() throws Exception {
 				"repositories { mavenCentral() }",
 				"",
 				"spotless {",
-				"  java {" +
+				"  java {",
 				"    licenseHeader('// my-copyright')",
 				"    toggleOffOn()",
 				"    targetExcludeIfContentContains('excludeMe')",

From ad5731ca12fd38023332bb66245851036f6a27d3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 May 2025 17:14:44 +0000
Subject: [PATCH 115/210] chore(deps): update dependency gradle to v8.14.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 ca025c83a7..002b867c48 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.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From e480175481a3e7d798b76b69784e59e807bcc48a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 03:57:16 +0000
Subject: [PATCH 116/210] fix(deps): update dependency
 org.eclipse.jgit:org.eclipse.jgit to v6.10.1.202505221210-r

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

diff --git a/gradle.properties b/gradle.properties
index 76cc1ce483..88e0942e34 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.10.0.202406032230-r
+VER_JGIT=6.10.1.202505221210-r
 VER_JUNIT=5.12.2
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.18.0

From 76a6b262b71c4f251f5339604ea0f02c45fa4319 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.219>
Date: Tue, 27 May 2025 14:21:15 -0700
Subject: [PATCH 117/210] Specify the new subkey.

---
 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 99879e6b2e..baad061ea8 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -181,7 +181,7 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 } else {
 	signing {
 		String gpg_key = decode64('ORG_GRADLE_PROJECT_gpg_key64')
-		useInMemoryPgpKeys(gpg_key, System.env['ORG_GRADLE_PROJECT_gpg_passphrase'])
+		useInMemoryPgpKeys('0x4272C851', gpg_key, System.env['ORG_GRADLE_PROJECT_gpg_passphrase'])
 		sign(publishing.publications)
 	}
 

From 1185afbd534b0eb9f80bdbbdd69ee90b73d1dea8 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.219>
Date: Tue, 27 May 2025 14:23:45 -0700
Subject: [PATCH 118/210] Update changelog with description of the deal with
 the new signing key.

---
 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 88a084a365..b473b703c4 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
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
+* gpg key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c26d0f6032..a163e6b7ee 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 (
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
+* gpg key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
 
 ## [7.0.3] - 2025-04-07
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 2558c7a239..d8f42c10f9 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 (
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
+* gpg key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
 
 ## [2.44.4] - 2025-04-07
 ### Changed

From 11d98ab949d8a7a95ff47a3e1eaad3f5a115da62 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.219>
Date: Tue, 27 May 2025 14:32:07 -0700
Subject: [PATCH 119/210] I guess it should be a `pgp` key, not `gpg`

---
 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 b473b703c4..3bacb52ae1 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]
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
-* gpg key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
+* pgp key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index a163e6b7ee..5c0f7840ad 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 (
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
-* gpg key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
+* pgp key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
 
 ## [7.0.3] - 2025-04-07
 ### Changed
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d8f42c10f9..4dd01135b2 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
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
-* gpg key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
+* pgp key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))
 
 ## [2.44.4] - 2025-04-07
 ### Changed

From b7957d7d4607b7912c12c14c0c7900064c5c14cd Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.219>
Date: Tue, 27 May 2025 14:34:39 -0700
Subject: [PATCH 120/210] Add the public key here too, it's also available at
 `hkps://keyserver.ubuntu.com` and `hkps://keys.openpgp.org`

---
 gradle/pgp-publickey-2025.asc | 64 +++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 gradle/pgp-publickey-2025.asc

diff --git a/gradle/pgp-publickey-2025.asc b/gradle/pgp-publickey-2025.asc
new file mode 100644
index 0000000000..c2836b5132
--- /dev/null
+++ b/gradle/pgp-publickey-2025.asc
@@ -0,0 +1,64 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGg1XNwBEADEE1ZUVTNJjPwE793zDJp579cWfPiWO99z8f5RE6776NQvmCcJ
+Dgag0HP9abPxjPzBLQCMJGJVbKbto8O7Hh1jlwOK6IjM6O38AFobL+3RSBMcYAq6
+NEY1xveL7wPoBKHeVbfe6VlKQwY0cORM/0dxvtcSxdR5qvw0X2JJhql+mxzv32GR
+NLvav8a5vNsJcSJfWW/rmqFkOjRpuG5xzxsoXFFghwnSagiqANFOdw71mU0/rC9r
+axAJQpH7iPYT0lFyZ9LpxA+pRK6WnaJNi/4thVLuRhe08EaYIwot2S1iJmY5AmvW
+5xIyk0QictibXxgaSSXO2ESWhTqoKmqM5ijkwzU5AZeH9gtCiL679+kASifx0BCs
+QwdxopuNfittvIh0SQJKyj9orGkAyQy/v6iLr4KOvf2S/sx/Uyvy1W0PZmuoWend
+iSACwipxWFrRihvPGS4vtrzV8UDdDtV3XBNTQxT/FvJiVscG0E36V6RLAYOHDhng
+qSiXfBfKEqTfJC0KD7Li2xx9WfZRfOEd3lpAcY3nLXXAzGEYJrFlGlPsoh0P+LbQ
+M85CFCpuIthYSj2lLdS2QdD2iVrUXbXyIs/kTeDFzoQX1qRA6LTCP/53BiV3axfl
+jeOCHU05W8yUxq6zoP1uVJL2BYlse14efwthfKt52cDji1fKoLEZY75Y2QARAQAB
+tDpEaWZmUGx1ZyBMTEMgKHJlbGVhc2Ugc2lnbmluZyBrZXkpIDxzZWN1cml0eUBk
+aWZmcGx1Zy5jb20+iQJXBBMBCABBFiEEJylEgvLS+aMYygQbGqqnqzcpPT4FAmg1
+XNwCGwMFCQlmAYAFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQGqqnqzcp
+PT6xAQ//UDcb8djxkkH5Cnmynt2kFZnzYhtGhP6CxwWnESCOv5LNk2KFUwVlDAPV
+h4XZpauHmXwD8gMfKrA7mvhRiQvC1BxZchVrMtn0oVWUag9RBSV8Kj3uiwmxeadD
+dwek5lUle2w7hJ/FilGs/0X9mxRBxyoa/kyaTpn+nHl2HlIMD8yN8a7WLk9i0Sx0
+GVKPQlY75jjE8yAdMnJdahKHq23LmDCpcO2BYi0B6PfKwdIKqmrjNkBSrDH+j92f
+iu9iX0mPmTEjHaED8xJYNHeK3hcx8IUDdI8KHU/Rj2GuyMwLGvzfCL4XV2YLBWTJ
+JEAk7kdaiKhy1pDSyzl8zwQYFur7UdwXmHznJvCyXSXwRsHzRnfPMzoYJWb8fUCe
+D10jOgnASfffjZfFnmAajqr1Rm7rxTeP8wvMMkbA0sHf4vOhQ/XsjSF2Uob39nFK
+50cTJGVrJlex/v72hVSBlK3agcFJOcC0RrDNajreqigERDKEgygYToN66KdU+LeD
+/dp05LmXQsRVlrC5FGsRlTtvfNcVJQjuIltD7xAsIWWHsBDzkgr7Tp9WvMpqIpIv
+e5yBfLWgQI/xICg3faPouFZRGrzxDFJX/1DRlv/j5pnDJLTY1uuRWNgE9H+yj0sA
+JWN8ogiYkAOQyDBovS29Xj2w09ElSI8g/Q2qqdEeaLBShMrUlUK5Ag0EaDVdyAEQ
+ALOP7mB7z0HTkGpFSh9AC9uNBZcdTXDvgRROtTF3cYCe8QxKNY9cMlYYNMCexNwz
+8HGqdcEJM40a9Z7Jqh0v1CWc+gb0Tl9SOFXkpfbCkaplTOd++YOSsTCt17XJHzWl
+K0B1jZkS0Dr1TWMKndUm3bgUdDHPvWExCpg2mizZyuSUY66W4uKvUi3zckqOVesX
+pWoN+molKOvzQf8nNgMn3V+BjwohLIRJ5lPuo/uA5gk3sC5jAib5uAS1J1dMQSlC
+vAf+Hy9LnkcdJPh22ukzYJoPDWym3puHWi03RHyAni653l/1Q41KZGr5gzLkjCIS
+NQJlFPNziH+PbkyHkhNfecEVisoLiJ0oh/3wKERcBrhHsgjCAw1c1pmCvvkyymnN
+mTxwuOakRIL8xGpaYIT47iuanLDrwgykR9Q3YwdN8Xyl0xu4eHhlKV1LSUbzewu1
+rBiqvKR4AP85xrywwvf0G25iwthcMq2PTkjI3cF/qMSDw+WImD2DBCt3gg0PW8ic
+PzIIBe1woVpIOLDP9ZSzc0pkS9KhmFKuXz+Yx0JcH8gsvd0t1i0SO+T0CWYZ1VJ0
+DsjimQsMNLqcf55moKlcfJLfN/khVQ5Stfsf9TpLppkMc0qM4RckYy1q3td7jC1h
+DG9RD7SsjdlrunEzU1Ld4oMWuDTTTbkXl+XzH9JtmcjVABEBAAGJBHIEGAEIACYW
+IQQnKUSC8tL5oxjKBBsaqqerNyk9PgUCaDVdyAIbAgUJCWYBgAJACRAaqqerNyk9
+PsF0IAQZAQgAHRYhBKMd3ogcPjxMmFvQ0Cx/mY9CcshRBQJoNV3IAAoJECx/mY9C
+cshR9ycP/ivFawfVQxmr3QB6TE6NyDRleWTYSL+58ZUAZZ0i3esqhe7ClUUUhBgi
+OZwc/YQWmNaQ65obX6LIAqv5LZsQ39K2N1Y1blGeuRWmHafIrE9mIn/52Z1tcK+a
+Q4H+54XnF7+o8EHJ9VGY/kVyxWugpsUy/NJ2OVn6fmVqSW+moptSMEH5p0uOvbCT
+ZGlFHnWvLqcb/rQXJ088QTezP6dfoeiOsX+jEhjYK3hKn/egzfLsXvQmln0gYFpU
+1Ujv7pUuKUviucCZ9OXs7hFVJWK8Ep4V52SMLUTrAMI1rdH8oTZff97D38NJPU8H
+nBufjkOm3Dh0pPuFSmueultr5iYrEYenu+H17OdwqXytQzep3x9ZFVCDUgJvxYXR
+J+O3t6lGQuGZkS8wDqkvitGq11nLEUDyjveiO2TvOe2RKX9y4GSp4oUcPNSGd7D8
+TnUe1kN9LbUTqeNwooQAHqpvpZq7qoCeOCsyKoqABxoPQNnTNlYe18WZar1eUF3k
+J7sqdqXBHSyfcIWQKBjYzIzp2o/j982hj6dQdh0M9nLR8MLsboaJ6OvBmFt9xlbU
+aErC9FUb6gG0eir/DsqUUYcIApnrMAjbQYXGpL7uAjcFvHZ43Yebb+oO5iDngoAb
+Lsoo2OzjPd1679qWE9fHrs9eTHJYpQxwarjJRvBNCe+DvCEjcDZkorMQAIM7tvVr
+nglPGqDxF0aKb6YFUsWdA0fFWXG1AQNjFElNxO6W4Ujmzmt1nl0Iy3z5x0CrKJKY
+NENe3gNzSHoSjFPJ94WIFYl7VbHIs1yUvIMBp71b5UaHE+HNBUnv9i8JCO4mjNUN
+pflFJYkTj3Svw8oNRQrw1R0B8o/Xtfm6sOb9g5nskjC97A/XIVJalBCdLRUrdBCK
+tMEy801n3RGcEN++Oz7/rcSgKxqCbYAicpEJCdoL/7Zra1mhe3iapv1fW9gWVG2z
+7HF49I8Wc+4uZUHdcAxs8SjFqpGnYG/IZrmPQeO3EptXRn7FEQaaN3slucFb2x78
+niKPcl1xX1ZFT4knQk1QIsExQtMyXcMgLxWwG4+33zRycjXrIkuf+oyVAeIn+vtx
+2D1uVDEPZqINvSqSkMNk0QFAtYa1v/tbN35bBr19w/lA/rPDcyFOqTUkMKYCEQ6y
+Pha1NYC0EnB4wmxq+elp44fVS1ZgzfpWEaQYtWInYvMGuZ0nICXM/CS0duH7SfqR
+urzKxWfFRX5otIRWMexBFDEP6dJXvUDhY2qDaNG+mHXSNtVa+jLik5KalMfmMb1M
+7ZKVUEROOscxVVjkaJGWIUPO88tFX0ehXJ5Oc8fRd5ZM0pNQr0xQLc05keVzQfNs
+P+FTigtEkgtwq3tg4SbO3+npkYfonuNv80ES
+=xCpO
+-----END PGP PUBLIC KEY BLOCK-----

From 845d51c5167a7f098b1ac0773fd77142a8280ef3 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1376-653>
Date: Tue, 27 May 2025 21:56:37 +0000
Subject: [PATCH 121/210] Published lib/3.1.2

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

diff --git a/CHANGES.md b/CHANGES.md
index 3bacb52ae1..920bef6631 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.2] - 2025-05-27
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
 * pgp key had expired, this and future releases will be signed by new key ([details](https://github.com/diffplug/spotless/discussions/2464))

From 04c0e770104696fd25fc620ebe06d57d385dc7f8 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1376-653>
Date: Tue, 27 May 2025 21:59:25 +0000
Subject: [PATCH 122/210] Published gradle/7.0.4

---
 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 5c0f7840ad..e35da34bfc 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.4] - 2025-05-27
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
 ### Changed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index da51e31244..e3bf3df8fd 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.3-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.0.4-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.3/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.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.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.4/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.4/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.4/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.4/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.4/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.4/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.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/7.0.4/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.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/7.0.4/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.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)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.4/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.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)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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)
+`com.diffplug.gradle.spotless.PomExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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)
+`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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.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/7.0.4/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 a76bd6e6c81717b8ab9d55ec4b6d470f24001ac6 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az1376-653>
Date: Tue, 27 May 2025 22:00:56 +0000
Subject: [PATCH 123/210] Published maven/2.44.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 4dd01135b2..d09ac6144f 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.5] - 2025-05-27
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
 * Bump default `greclipse` version to latest `4.32` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index c1a346926b..cafb11ea43 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.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)
+[![Changelog](https://img.shields.io/badge/changelog-2.44.5-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.5/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From aa6f005dea937ec7b7724fe51853c1a721b9b0f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 May 2025 02:40:25 +0000
Subject: [PATCH 124/210] chore(deps): update plugin com.diffplug.spotless to
 v7.0.4

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

diff --git a/settings.gradle b/settings.gradle
index 4108bfc731..e198d017d2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.3' apply false
+	id 'com.diffplug.spotless' version '7.0.4' 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

From 688b9f52d959ad901f1414842b40239552dae4de Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 May 2025 18:05:24 +0800
Subject: [PATCH 125/210] chore(deps): update plugin com.github.spotbugs to
 v6.1.13 (#2498)

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 e198d017d2..c6831e1b4d 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.12' apply false
+	id 'com.github.spotbugs' version '6.1.13' 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 1313c4ddbb682c4ab4ea082895cad63405cc84b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Jourdan-Weil?= <gjourdanweil@gmail.com>
Date: Thu, 29 May 2025 16:30:16 +0200
Subject: [PATCH 126/210] =?UTF-8?q?=E2=9C=A8=20feat(scalafmt):=20enforce?=
 =?UTF-8?q?=20version=20consistency=20in=20library=20and=20config=20file?=
 =?UTF-8?q?=20(fix=20#2460)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #2460
---
 .../spotless/glue/scalafmt/ScalafmtFormatterFunc.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 6217ab6186..afabcbbf64 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
@@ -21,6 +21,7 @@
 import java.nio.file.Files;
 
 import org.scalafmt.Scalafmt;
+import org.scalafmt.Versions;
 import org.scalafmt.config.ScalafmtConfig;
 import org.scalafmt.config.ScalafmtConfig$;
 
@@ -45,6 +46,16 @@ public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
 			String configStr = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
 			config = Scalafmt.parseHoconConfig(configStr).get();
 		}
+
+		// This check is to raise awareness to the user that the version of the config file is currently not used.
+		// Context: https://github.com/diffplug/spotless/issues/2460
+		// This check should be removed when Spotless dynamically loads the proper version of the Scalafmt library.
+		String scalafmtLibraryVersion = Versions.version();
+		if (!config.version().equals(scalafmtLibraryVersion)) {
+			throw new IllegalArgumentException(
+				"Spotless is using " + scalafmtLibraryVersion + " but the config file declares " + config.version() +
+					". Both must match. Update the version declared in the plugin's settings and/or the config file.");
+		}
 	}
 
 	@Override

From cf225e436155be8a828b14047b20d7ad27786d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Jourdan-Weil?= <gjourdanweil@gmail.com>
Date: Thu, 29 May 2025 16:35:17 +0200
Subject: [PATCH 127/210] =?UTF-8?q?=F0=9F=93=9D=20docs:=20add=20CHANGELOG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 920bef6631..e173afac8c 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]
 
+### Changed
+* scalafmt: enforce version consistency between the version configured in Spotless and the version declared in Scalafmt config file ([#2460](https://github.com/diffplug/spotless/issues/2460))
+
 ## [3.1.2] - 2025-05-27
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e35da34bfc..9388934661 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]
 
+### Changed
+* scalafmt: enforce version consistency between the version configured in Spotless and the version declared in Scalafmt config file ([#2460](https://github.com/diffplug/spotless/issues/2460))
+
 ## [7.0.4] - 2025-05-27
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d09ac6144f..35752fe6db 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]
 
+### Changed
+* scalafmt: enforce version consistency between the version configured in Spotless and the version declared in Scalafmt config file ([#2460](https://github.com/diffplug/spotless/issues/2460))
+
 ## [2.44.5] - 2025-05-27
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))

From 5508a344a69915a9469acd524234ac9d61b87e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Jourdan-Weil?= <gjourdanweil@gmail.com>
Date: Thu, 29 May 2025 17:20:31 +0200
Subject: [PATCH 128/210] style: fix formatting

---
 .../spotless/glue/scalafmt/ScalafmtFormatterFunc.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 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 afabcbbf64..ab7e56ba45 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-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.
@@ -53,8 +53,8 @@ public ScalafmtFormatterFunc(FileSignature configSignature) throws Exception {
 		String scalafmtLibraryVersion = Versions.version();
 		if (!config.version().equals(scalafmtLibraryVersion)) {
 			throw new IllegalArgumentException(
-				"Spotless is using " + scalafmtLibraryVersion + " but the config file declares " + config.version() +
-					". Both must match. Update the version declared in the plugin's settings and/or the config file.");
+					"Spotless is using " + scalafmtLibraryVersion + " but the config file declares " + config.version() +
+							". Both must match. Update the version declared in the plugin's settings and/or the config file.");
 		}
 	}
 

From 05fe1fe3b72c5fbfd215dff942693f8b1a3386fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Jourdan-Weil?= <gjourdanweil@gmail.com>
Date: Thu, 29 May 2025 17:31:06 +0200
Subject: [PATCH 129/210] test: update tests

---
 .../com/diffplug/spotless/scala/ScalaFmtStepTest.java | 11 ++++++-----
 1 file changed, 6 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 48b277566e..1c534f5aef 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-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.
@@ -48,17 +48,18 @@ void behaviorFileOverride() {
 	}
 
 	@Test
-	void behaviorDefaultConfigVersion_3_0_0() {
+	void behaviorNoConfigFile() {
 		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() {
+	void behaviorConfigFileVersionDoesnotMatchLibrary() {
 		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");
+		Assertions.assertThatThrownBy(() -> {
+			step.format("", new File(""));
+		}).cause().message().contains("Spotless is using 3.0.0 but the config file declares 3.8.1. Both must match. Update the version declared in the plugin's settings and/or the config file.");
 	}
 
 	@Test

From b8e8f48b4e83ae49eb1c524a22753ca82beca921 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 31 May 2025 17:17:24 +0800
Subject: [PATCH 130/210] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.13.0 (#2501)

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 88e0942e34..15029d95ab 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.1.202505221210-r
-VER_JUNIT=5.12.2
+VER_JUNIT=5.13.0
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.18.0
 VER_SELFIE=2.5.3
\ No newline at end of file

From 03b6ea6841b24446c22f348eeb346f4cfc855859 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 09:04:10 +0800
Subject: [PATCH 131/210] chore(deps): update dependency gradle to v8.14.2
 (#2506)

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 002b867c48..ff23a68d70 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.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 2cc8c04ad168641c9cbd6fa99d30e3c7dfdb3b68 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 14:42:36 +0800
Subject: [PATCH 132/210] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.13.1 (#2508)

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 15029d95ab..1ef2017082 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.1.202505221210-r
-VER_JUNIT=5.13.0
+VER_JUNIT=5.13.1
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.18.0
 VER_SELFIE=2.5.3
\ No newline at end of file

From 922f9f170ba5562a83f45e0d138b1d7f62fbc1bd Mon Sep 17 00:00:00 2001
From: iddeepak <87892182+iddeepak@users.noreply.github.com>
Date: Tue, 24 Jun 2025 08:06:03 +0530
Subject: [PATCH 133/210] Support removing wildcard imports via
 removeWildcardImports step (#2517)

* Remove wildcard imports

* Update plugin-gradle/README.md

Co-authored-by: Consequences of Lacking Discipline <8830888+Pankraz76@users.noreply.github.com>

* Update testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsUnformatted.test

Co-authored-by: Consequences of Lacking Discipline <8830888+Pankraz76@users.noreply.github.com>

* Apply suggestions from code review

* gradle test

* gradle test

* Update plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* spotless apply

* spotless apply

* spotless apply

* Apply suggestions from code review

---------

Co-authored-by: Consequences of Lacking Discipline <8830888+Pankraz76@users.noreply.github.com>
Co-authored-by: Zongle Wang <wangzongler@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 CHANGES.md                                    |  2 ++
 .../java/RemoveWildcardImportsStep.java       | 32 ++++++++++++++++++
 plugin-gradle/CHANGES.md                      |  2 ++
 plugin-gradle/README.md                       | 11 +++++++
 .../gradle/spotless/JavaExtension.java        |  7 +++-
 .../spotless/JavaDefaultTargetTest.java       | 20 +++++++++++
 plugin-maven/CHANGES.md                       |  2 ++
 plugin-maven/README.md                        |  7 ++++
 .../diffplug/spotless/maven/java/Java.java    |  6 +++-
 .../maven/java/RemoveWildcardImports.java     | 28 ++++++++++++++++
 .../java/RemoveWildcardImportsStepTest.java   | 33 +++++++++++++++++++
 .../JavaCodeWildcardsFormatted.test           |  4 +++
 .../JavaCodeWildcardsUnformatted.test         |  9 +++++
 13 files changed, 161 insertions(+), 2 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/java/RemoveWildcardImportsStep.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/java/RemoveWildcardImports.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveWildcardImportsStepTest.java
 create mode 100644 testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsFormatted.test
 create mode 100644 testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsUnformatted.test

diff --git a/CHANGES.md b/CHANGES.md
index 920bef6631..ba1e66f1f7 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 support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
 ## [3.1.2] - 2025-05-27
 ### Fixed
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveWildcardImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveWildcardImportsStep.java
new file mode 100644
index 0000000000..ca513b8280
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/java/RemoveWildcardImportsStep.java
@@ -0,0 +1,32 @@
+/*
+ * 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.java;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.generic.ReplaceRegexStep;
+
+/** Removes any wildcard import statements. */
+public final class RemoveWildcardImportsStep {
+	private RemoveWildcardImportsStep() {}
+
+	public static FormatterStep create() {
+		// Matches lines like 'import foo.*;' or 'import static foo.*;'.
+		return ReplaceRegexStep.create(
+				"removeWildcardImports",
+				"(?m)^import\\s+(?:static\\s+)?[^;\\n]*\\*;\\R?",
+				"");
+	}
+}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e35da34bfc..c7fc99944b 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 support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
 ## [7.0.4] - 2025-05-27
 ### Fixed
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index e3bf3df8fd..7a2c6b42b7 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -188,6 +188,7 @@ spotless {
     importOrderFile('eclipse-import-order.txt') // import order file as exported from eclipse
 
     removeUnusedImports()
+    removeWildcardImports()
 
     // Cleanthat will refactor your code, but it may break your style: apply it before your formatter
     cleanthat()          // has its own section below
@@ -227,6 +228,16 @@ spotless {
   removeUnusedImports('cleanthat-javaparser-unnecessaryimport')
 ```
 
+### removeWildcardImports
+
+```
+spotless {
+  java {
+    removeWildcardImports()
+  }
+}
+```
+
 ### google-java-format
 
 [homepage](https://github.com/google/google-java-format). [changelog](https://github.com/google/google-java-format/releases).
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 b7d3c84304..aeed7b64b5 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-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.
@@ -41,6 +41,7 @@
 import com.diffplug.spotless.java.ImportOrderStep;
 import com.diffplug.spotless.java.PalantirJavaFormatStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
+import com.diffplug.spotless.java.RemoveWildcardImportsStep;
 
 public class JavaExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
 	static final String NAME = "java";
@@ -151,6 +152,10 @@ public void removeUnusedImports(String formatter) {
 		addStep(RemoveUnusedImportsStep.create(formatter, provisioner()));
 	}
 
+	public void removeWildcardImports() {
+		addStep(RemoveWildcardImportsStep.create());
+	}
+
 	/** Uses the <a href="https://github.com/google/google-java-format">google-java-format</a> jar to format source code. */
 	public GoogleJavaFormatConfig googleJavaFormat() {
 		return googleJavaFormat(GoogleJavaFormatStep.defaultVersion());
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 a244de372e..401e8ee330 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
@@ -81,6 +81,26 @@ void removeUnusedImportsWithCleanthat() throws IOException {
 		assertFile("src/main/java/test.java").sameAsResource("java/removeunusedimports/Jdk17TextBlockFormatted.test");
 	}
 
+	@Test
+	void removeWildCardImports() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"    java {",
+				"        target file('test.java')",
+				"        removeWildcardImports()",
+				"    }",
+				"}");
+
+		setFile("test.java").toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").sameAsResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test");
+	}
+
 	/**
 	 * Triggers the special case in {@link FormatExtension#setupTask(SpotlessTask)} with {@code toggleFence} and
 	 * {@code targetExcludeContentPattern} both being not {@code null}.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d09ac6144f..53c6f4b093 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 support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
 ## [2.44.5] - 2025-05-27
 ### Changed
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index cafb11ea43..b27ddc4eab 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -210,6 +210,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
     </importOrder>
 
     <removeUnusedImports /> <!-- self-explanatory -->
+    <removeWildcardImports /> <!-- drop any import ending with '*' -->
 
     <formatAnnotations />  <!-- fixes formatting of type annotations, see below -->
 
@@ -228,6 +229,12 @@ any other maven phase (i.e. compile) then it can be configured as below;
 </removeUnusedImports>
 ```
 
+### removeWildcardImports
+
+```xml
+<removeWildcardImports/>
+```
+
 ### 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).
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..9fdb794eb1 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-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.
@@ -76,6 +76,10 @@ public void addRemoveUnusedImports(RemoveUnusedImports removeUnusedImports) {
 		addStepFactory(removeUnusedImports);
 	}
 
+	public void addRemoveWildcardImports(RemoveWildcardImports removeWildcardImports) {
+		addStepFactory(removeWildcardImports);
+	}
+
 	public void addFormatAnnotations(FormatAnnotations formatAnnotations) {
 		addStepFactory(formatAnnotations);
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/RemoveWildcardImports.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/RemoveWildcardImports.java
new file mode 100644
index 0000000000..8620088a08
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/RemoveWildcardImports.java
@@ -0,0 +1,28 @@
+/*
+ * 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.maven.java;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.java.RemoveWildcardImportsStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+public class RemoveWildcardImports implements FormatterStepFactory {
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		return RemoveWildcardImportsStep.create();
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveWildcardImportsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveWildcardImportsStepTest.java
new file mode 100644
index 0000000000..4d4ade94d0
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveWildcardImportsStepTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.maven.java;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class RemoveWildcardImportsStepTest extends MavenIntegrationHarness {
+
+	@Test
+	void testRemoveWildcardImports() throws Exception {
+		writePomWithJavaSteps("<removeWildcardImports/>");
+
+		String path = "src/main/java/test.java";
+		setFile(path).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test");
+	}
+}
diff --git a/testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsFormatted.test b/testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsFormatted.test
new file mode 100644
index 0000000000..85ee903fc5
--- /dev/null
+++ b/testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsFormatted.test
@@ -0,0 +1,4 @@
+import java.util.List;
+import mylib.Helper;
+
+public class Test {}
\ No newline at end of file
diff --git a/testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsUnformatted.test b/testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsUnformatted.test
new file mode 100644
index 0000000000..74646094ae
--- /dev/null
+++ b/testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsUnformatted.test
@@ -0,0 +1,9 @@
+import java.util.*;
+import static java.util.Collections.*;
+import java.util.List;
+import mylib.Helper;
+import io.quarkus.maven.dependency.*;
+import static io.quarkus.vertx.web.Route.HttpMethod.*;
+import static org.springframework.web.reactive.function.BodyInserters.*;
+
+public class Test {}
\ No newline at end of file

From a7532e08ffd4f9aa86912a34d49709d576e687bd Mon Sep 17 00:00:00 2001
From: Vincent Potucek <vpotucek@me.com>
Date: Tue, 24 Jun 2025 11:59:58 +0200
Subject: [PATCH 134/210] Add project icon for IntelliJ IDEA

---
 .gitignore     |   1 +
 .idea/icon.png | Bin 0 -> 1639 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 .idea/icon.png

diff --git a/.gitignore b/.gitignore
index ab04bc7021..2f8c81aca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@ local.properties
 
 ## Directory-based project format:
 .idea/
+!.idea/icon.png
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff:
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e97f5f723ea389e304eaaba5021b3304364823a
GIT binary patch
literal 1639
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

literal 0
HcmV?d00001


From e057b1eb843f09976f5a842c2608a6d457901035 Mon Sep 17 00:00:00 2001
From: Vincent Potucek <vpotucek@me.com>
Date: Tue, 24 Jun 2025 15:06:33 +0200
Subject: [PATCH 135/210] activate formatAnnotations()

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

diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index 677630ac69..1a10f7239d 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: formatAnnotations()
+			formatAnnotations()
 			custom 'noInternalDeps', noInternalDepsClosure
 		}
 	}

From 39d16538cab0e36323a0bf816b58dcc7f96c3768 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 9 May 2025 20:37:46 +0200
Subject: [PATCH 136/210] refactor: move `idea` to generic formatters

as it can handle various file formats besides java.
---
 .../spotless/{java => generic}/IdeaStep.java  |  4 +-
 .../gradle/spotless/FormatExtension.java      | 40 +++++++++++++++++++
 .../gradle/spotless/JavaExtension.java        | 40 -------------------
 .../gradle/spotless/JavaIdeaTest.java         |  2 +-
 .../spotless/maven/FormatterFactory.java      |  7 +++-
 .../maven/{java => generic}/Idea.java         |  6 +--
 .../diffplug/spotless/maven/java/Java.java    |  4 --
 .../maven/{java => generic}/IdeaTest.java     |  4 +-
 .../diffplug/spotless/ResourceHarness.java    |  2 +-
 .../com/diffplug/spotless/tag/IdeaTest.java   |  2 +-
 .../{java => generic}/IdeaStepTest.java       |  4 +-
 11 files changed, 58 insertions(+), 57 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/{java => generic}/IdeaStep.java (98%)
 rename plugin-maven/src/main/java/com/diffplug/spotless/maven/{java => generic}/Idea.java (90%)
 rename plugin-maven/src/test/java/com/diffplug/spotless/maven/{java => generic}/IdeaTest.java (93%)
 rename testlib/src/test/java/com/diffplug/spotless/{java => generic}/IdeaStepTest.java (97%)

diff --git a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
similarity index 98%
rename from lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
rename to lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index d069e721fb..60f51d5d42 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.java;
+package com.diffplug.spotless.generic;
 
 import java.io.File;
 import java.io.IOException;
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 40069850c5..d60dec3af0 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,6 +65,7 @@
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
 import com.diffplug.spotless.generic.EndWithNewlineStep;
 import com.diffplug.spotless.generic.FenceStep;
+import com.diffplug.spotless.generic.IdeaStep;
 import com.diffplug.spotless.generic.IndentStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep.YearMode;
@@ -960,6 +961,45 @@ public EclipseWtpConfig eclipseWtp(EclipseWtpFormatterStep type, String version)
 		return new EclipseWtpConfig(type, version);
 	}
 
+	public IdeaConfig idea() {
+		return new IdeaConfig();
+	}
+
+	public class IdeaConfig {
+		private String binaryPath;
+		private String configPath;
+		private boolean withDefaults = false;
+
+		IdeaConfig() {
+			addStep(createStep());
+		}
+
+		private FormatterStep createStep() {
+			return IdeaStep.create(withDefaults, binaryPath, configPath);
+		}
+
+		public IdeaConfig binaryPath(String binaryPath) {
+			requireNonNull(binaryPath);
+			this.binaryPath = binaryPath;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public IdeaConfig configPath(String configPath) {
+			requireNonNull(configPath);
+			this.configPath = configPath;
+			replaceStep(createStep());
+			return this;
+		}
+
+		public IdeaConfig withDefaults(Boolean withDefaults) {
+			requireNonNull(withDefaults);
+			this.withDefaults = withDefaults;
+			replaceStep(createStep());
+			return this;
+		}
+	}
+
 	/**
 	 * <pre>
 	 * spotless {
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 8440fc4d73..f0530fb968 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
@@ -38,7 +38,6 @@
 import com.diffplug.spotless.java.CleanthatJavaStep;
 import com.diffplug.spotless.java.FormatAnnotationsStep;
 import com.diffplug.spotless.java.GoogleJavaFormatStep;
-import com.diffplug.spotless.java.IdeaStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 import com.diffplug.spotless.java.PalantirJavaFormatStep;
 import com.diffplug.spotless.java.RemoveUnusedImportsStep;
@@ -358,45 +357,6 @@ public EclipseConfig withP2Mirrors(Map<String, String> mirrors) {
 
 	}
 
-	public IdeaConfig idea() {
-		return new IdeaConfig();
-	}
-
-	public class IdeaConfig {
-		private String binaryPath;
-		private String configPath;
-		private boolean withDefaults = false;
-
-		IdeaConfig() {
-			addStep(createStep());
-		}
-
-		private FormatterStep createStep() {
-			return IdeaStep.create(withDefaults, binaryPath, configPath);
-		}
-
-		public IdeaConfig binaryPath(String binaryPath) {
-			Objects.requireNonNull(binaryPath);
-			this.binaryPath = binaryPath;
-			replaceStep(createStep());
-			return this;
-		}
-
-		public IdeaConfig configPath(String configPath) {
-			Objects.requireNonNull(configPath);
-			this.configPath = configPath;
-			replaceStep(createStep());
-			return this;
-		}
-
-		public IdeaConfig withDefaults(Boolean withDefaults) {
-			Objects.requireNonNull(withDefaults);
-			this.withDefaults = withDefaults;
-			replaceStep(createStep());
-			return this;
-		}
-	}
-
 	/** Removes newlines between type annotations and types. */
 	public FormatAnnotationsConfig formatAnnotations() {
 		return new FormatAnnotationsConfig();
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
index b154c2d851..bea9272236 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaIdeaTest.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-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java
index 456c31b9a3..143bd56e69 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-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,6 +38,7 @@
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.maven.generic.EclipseWtp;
 import com.diffplug.spotless.maven.generic.EndWithNewline;
+import com.diffplug.spotless.maven.generic.Idea;
 import com.diffplug.spotless.maven.generic.Indent;
 import com.diffplug.spotless.maven.generic.Jsr223;
 import com.diffplug.spotless.maven.generic.LicenseHeader;
@@ -147,6 +148,10 @@ public final void addPrettier(Prettier prettier) {
 		addStepFactory(prettier);
 	}
 
+	public final void addIdea(Idea idea) {
+		addStepFactory(idea);
+	}
+
 	public final void addToggleOffOn(ToggleOffOn toggle) {
 		this.toggle = toggle;
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
similarity index 90%
rename from plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
rename to plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
index 8981a9dc9b..c908fe77c9 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Idea.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.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.
@@ -13,12 +13,12 @@
  * 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.generic;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.java.IdeaStep;
+import com.diffplug.spotless.generic.IdeaStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
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 dc5de3df25..9fdb794eb1 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
@@ -68,10 +68,6 @@ public void addImportOrder(ImportOrder importOrder) {
 		addStepFactory(importOrder);
 	}
 
-	public void addIdea(Idea idea) {
-		addStepFactory(idea);
-	}
-
 	public void addPalantirJavaFormat(PalantirJavaFormat palantirJavaFormat) {
 		addStepFactory(palantirJavaFormat);
 	}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/IdeaTest.java
similarity index 93%
rename from plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
rename to plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/IdeaTest.java
index c11b2a64d1..c368213437 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/IdeaTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/generic/IdeaTest.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.
@@ -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.generic;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java b/testlib/src/main/java/com/diffplug/spotless/ResourceHarness.java
index 0bac44952f..caf668ae8d 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-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/tag/IdeaTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/IdeaTest.java
index 79813d91d9..c9f351cdcb 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/IdeaTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/IdeaTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 DiffPlug
+ * Copyright 2021-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/test/java/com/diffplug/spotless/java/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
similarity index 97%
rename from testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
rename to testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
index 98de28627a..d365782db1 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.java;
+package com.diffplug.spotless.generic;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;

From 599ad51622d0223dbbda8f013e38959ae656f6be Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 12 May 2025 21:06:26 +0200
Subject: [PATCH 137/210] refactor: use builder for idea-step creation

---
 .../diffplug/spotless/generic/IdeaStep.java   | 99 ++++++++++++++-----
 .../gradle/spotless/FormatExtension.java      | 14 +--
 .../diffplug/spotless/maven/generic/Idea.java |  6 +-
 .../spotless/generic/IdeaStepTest.java        | 12 +--
 4 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index 60f51d5d42..775660257f 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -21,12 +21,14 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.slf4j.Logger;
@@ -40,51 +42,70 @@
 
 public final class IdeaStep {
 
+	public static final String NAME = "IDEA";
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(IdeaStep.class);
 
 	private IdeaStep() {}
 
-	public static FormatterStep create() {
-		return create(true);
+	public static IdeaStepBuilder create() {
+		return new IdeaStepBuilder();
 	}
 
-	public static FormatterStep create(boolean withDefaults) {
-		return create(withDefaults, null);
+	private static FormatterStep create(@Nonnull IdeaStepBuilder builder) {
+		Objects.requireNonNull(builder);
+		return FormatterStep.createLazy(NAME,
+				() -> createState(builder),
+				state -> state);
 	}
 
-	public static FormatterStep create(boolean withDefaults,
-			@Nullable String binaryPath) {
-		return create(withDefaults, binaryPath, null);
+	private static State createState(@Nonnull IdeaStepBuilder builder) {
+		return new State(Objects.requireNonNull(builder));
 	}
 
-	public static FormatterStep create(boolean withDefaults,
-			@Nullable String binaryPath, @Nullable String codeStyleSettingsPath) {
-		return FormatterStep.createLazy("IDEA",
-				() -> createState(withDefaults, binaryPath, codeStyleSettingsPath),
-				state -> state);
-	}
+	public static final class IdeaStepBuilder {
+		private static final String DEFAULT_IDEA = "idea";
+
+		private boolean useDefaults = true;
+		@Nonnull
+		private String binaryPath = DEFAULT_IDEA;
+		@Nullable
+		private String codeStyleSettingsPath;
+
+		public IdeaStepBuilder setUseDefaults(boolean useDefaults) {
+			this.useDefaults = useDefaults;
+			return this;
+		}
+
+		public IdeaStepBuilder setBinaryPath(@Nonnull String binaryPath) {
+			this.binaryPath = Objects.requireNonNull(binaryPath);
+			return this;
+		}
+
+		public IdeaStepBuilder setCodeStyleSettingsPath(@Nullable String codeStyleSettingsPath) {
+			this.codeStyleSettingsPath = codeStyleSettingsPath;
+			return this;
+		}
 
-	private static State createState(boolean withDefaults,
-			@Nullable String binaryPath, @Nullable String codeStyleSettingsPath) {
-		return new State(withDefaults, binaryPath, codeStyleSettingsPath);
+		public FormatterStep build() {
+			return create(this);
+		}
 	}
 
 	private static class State
 			implements FormatterFunc.NeedsFile, Serializable {
 
 		private static final long serialVersionUID = -1825662355363926318L;
-		private static final String DEFAULT_IDEA = "idea";
 
 		private String binaryPath;
 		@Nullable
 		private String codeStyleSettingsPath;
 		private boolean withDefaults;
 
-		private State(boolean withDefaults, @Nullable String binaryPath,
-				@Nullable String codeStyleSettingsPath) {
-			this.withDefaults = withDefaults;
-			this.codeStyleSettingsPath = codeStyleSettingsPath;
-			this.binaryPath = Objects.requireNonNullElse(binaryPath, DEFAULT_IDEA);
+		private State(@Nonnull IdeaStepBuilder builder) {
+			this.withDefaults = builder.useDefaults;
+			this.codeStyleSettingsPath = builder.codeStyleSettingsPath;
+			this.binaryPath = builder.binaryPath;
 			resolveFullBinaryPathAndCheckVersion();
 		}
 
@@ -113,10 +134,38 @@ private String pathToExe() {
 			if (binaryPath == null) {
 				throw new IllegalStateException("binaryPath is not set");
 			}
-			if (new File(binaryPath).exists()) {
-				return binaryPath;
+			return macOsFix(binaryPath);
+		}
+
+		@CheckForNull
+		private static String macOsFix(String binaryPath) {
+			if (!isMacOs()) {
+				if (new File(binaryPath).exists()) {
+					return binaryPath;
+				}
+				return null; // search in PATH
+			}
+			// on macOS, the binary is located in the .app bundle which might be invisible to the user
+			// we try need to append the path to the binary
+			File binary = new File(binaryPath);
+			if (!binary.exists()) {
+				// maybe it is bundle path without .app? (might be hidden by os)
+				binary = new File(binaryPath + ".app");
+				if (!binary.exists()) {
+					return binaryPath; // fallback: do nothing
+				}
+			}
+			if (binaryPath.endsWith(".app") || binary.isDirectory()) {
+				binary = new File(binary, "Contents/MacOS/idea");
 			}
-			return null; // search in PATH
+			if (binary.isFile() && binary.canExecute()) {
+				return binary.getPath();
+			}
+			return binaryPath; // fallback: do nothing
+		}
+
+		private static boolean isMacOs() {
+			return System.getProperty("os.name").toLowerCase().contains("mac");
 		}
 
 		@Override
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 d60dec3af0..ab93e53881 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
@@ -966,35 +966,35 @@ public IdeaConfig idea() {
 	}
 
 	public class IdeaConfig {
-		private String binaryPath;
-		private String configPath;
-		private boolean withDefaults = false;
+		private final IdeaStep.IdeaStepBuilder builder;
 
 		IdeaConfig() {
+			this.builder = IdeaStep.create();
 			addStep(createStep());
 		}
 
 		private FormatterStep createStep() {
-			return IdeaStep.create(withDefaults, binaryPath, configPath);
+			return builder.build();
 		}
 
 		public IdeaConfig binaryPath(String binaryPath) {
 			requireNonNull(binaryPath);
-			this.binaryPath = binaryPath;
+			builder.setBinaryPath(binaryPath);
 			replaceStep(createStep());
 			return this;
 		}
 
+		// TODO (simschla, 11.05.2025): rename
 		public IdeaConfig configPath(String configPath) {
 			requireNonNull(configPath);
-			this.configPath = configPath;
+			builder.setCodeStyleSettingsPath(configPath);
 			replaceStep(createStep());
 			return this;
 		}
 
 		public IdeaConfig withDefaults(Boolean withDefaults) {
 			requireNonNull(withDefaults);
-			this.withDefaults = withDefaults;
+			builder.setUseDefaults(withDefaults);
 			replaceStep(createStep());
 			return this;
 		}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
index c908fe77c9..67a4d5b556 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
@@ -35,6 +35,10 @@ public class Idea implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		return IdeaStep.create(withDefaults, binaryPath, configPath);
+		return IdeaStep.create()
+				.setUseDefaults(withDefaults)
+				.setCodeStyleSettingsPath(configPath)
+				.setBinaryPath(binaryPath)
+				.build();
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
index d365782db1..328d9f934e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
@@ -31,7 +31,7 @@ class IdeaStepTest extends ResourceHarness {
 
 	@Test
 	void name() throws Exception {
-		FormatterStep step = IdeaStep.create(true, "idea");
+		FormatterStep step = IdeaStep.create().setUseDefaults(true).setBinaryPath("idea").build();
 
 		String name = step.getName();
 
@@ -43,7 +43,7 @@ void notFormattings() throws Exception {
 		File cleanFile = newFile("clean.java");
 		String cleanJava = ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(true, "idea");
+		FormatterStep step = IdeaStep.create().setUseDefaults(true).setBinaryPath("/Users/simschla/Applications/IntelliJ IDEA Ultimate.app/Contents/MacOS/idea").build();
 
 		var result = step.format(cleanJava, cleanFile);
 
@@ -56,7 +56,7 @@ void formattings() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(true, "idea");
+		FormatterStep step = IdeaStep.create().setUseDefaults(true).setBinaryPath("/Users/simschla/Applications/IntelliJ IDEA Ultimate.app/Contents/MacOS/idea").build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -69,7 +69,7 @@ void formattingsWorkWithDefaultParameters() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create();
+		FormatterStep step = IdeaStep.create().build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -82,7 +82,7 @@ void formattingsWithOutDefaultDoesNothing() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(false, "idea");
+		FormatterStep step = IdeaStep.create().setUseDefaults(false).setBinaryPath("idea").build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -95,7 +95,7 @@ void configureFile() throws Exception {
 		File cleanFile = newFile("clean.java");
 		String cleanJava = ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(true, "idea");
+		FormatterStep step = IdeaStep.create().setUseDefaults(true).setBinaryPath("idea").build();
 
 		var result = step.format(cleanJava, cleanFile);
 

From d771a9caa0c0e821504e7cbe52640abdd5011bf7 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 13 May 2025 17:58:11 +0200
Subject: [PATCH 138/210] chore: provide custom idea.properties with custom
 config/system paths

---
 .../diffplug/spotless/generic/IdeaStep.java   | 96 +++++++++++++++----
 .../gradle/spotless/FormatExtension.java      |  2 +-
 .../diffplug/spotless/maven/generic/Idea.java |  2 +-
 .../spotless/generic/IdeaStepTest.java        | 22 +++--
 4 files changed, 96 insertions(+), 26 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index 775660257f..066e47577f 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -16,13 +16,19 @@
 package com.diffplug.spotless.generic;
 
 import java.io.File;
+import java.io.FileOutputStream;
 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.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Properties;
+import java.util.TreeMap;
+import java.util.UUID;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -44,12 +50,16 @@ public final class IdeaStep {
 
 	public static final String NAME = "IDEA";
 
+	public static final String IDEA_EXECUTABLE_DEFAULT = "idea";
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(IdeaStep.class);
+	public static final String IDEA_CONFIG_PATH_PROPERTY = "idea.config.path";
+	public static final String IDEA_SYSTEM_PATH_PROPERTY = "idea.system.path";
 
 	private IdeaStep() {}
 
-	public static IdeaStepBuilder create() {
-		return new IdeaStepBuilder();
+	public static IdeaStepBuilder create(@Nonnull File buildDir) {
+		return new IdeaStepBuilder(Objects.requireNonNull(buildDir));
 	}
 
 	private static FormatterStep create(@Nonnull IdeaStepBuilder builder) {
@@ -64,13 +74,20 @@ private static State createState(@Nonnull IdeaStepBuilder builder) {
 	}
 
 	public static final class IdeaStepBuilder {
-		private static final String DEFAULT_IDEA = "idea";
 
 		private boolean useDefaults = true;
 		@Nonnull
-		private String binaryPath = DEFAULT_IDEA;
+		private String binaryPath = IDEA_EXECUTABLE_DEFAULT;
 		@Nullable
 		private String codeStyleSettingsPath;
+		private final Map<String, String> ideaProperties = new HashMap<>();
+
+		@Nonnull
+		private final File buildDir;
+
+		private IdeaStepBuilder(@Nonnull File buildDir) {
+			this.buildDir = Objects.requireNonNull(buildDir);
+		}
 
 		public IdeaStepBuilder setUseDefaults(boolean useDefaults) {
 			this.useDefaults = useDefaults;
@@ -87,6 +104,14 @@ public IdeaStepBuilder setCodeStyleSettingsPath(@Nullable String codeStyleSettin
 			return this;
 		}
 
+		public IdeaStepBuilder setIdeaProperties(@Nonnull Map<String, String> ideaProperties) {
+			if (ideaProperties.containsKey(IDEA_CONFIG_PATH_PROPERTY) || ideaProperties.containsKey(IDEA_SYSTEM_PATH_PROPERTY)) {
+				throw new IllegalArgumentException("Cannot override IDEA config or system path");
+			}
+			this.ideaProperties.putAll(ideaProperties);
+			return this;
+		}
+
 		public FormatterStep build() {
 			return create(this);
 		}
@@ -97,22 +122,27 @@ private static class State
 
 		private static final long serialVersionUID = -1825662355363926318L;
 
-		private String binaryPath;
+		private final String buildDir;
+		private final String uniquePath;
+		private final String binaryPath;
 		@Nullable
-		private String codeStyleSettingsPath;
-		private boolean withDefaults;
+		private final String codeStyleSettingsPath; // TODO make sure to save content in state
+		private final boolean withDefaults;
+		private final TreeMap<String, String> ideaProperties;
 
 		private State(@Nonnull IdeaStepBuilder builder) {
+			this.buildDir = ThrowingEx.get(builder.buildDir::getCanonicalPath);
+			this.uniquePath = UUID.randomUUID().toString();
 			this.withDefaults = builder.useDefaults;
 			this.codeStyleSettingsPath = builder.codeStyleSettingsPath;
-			this.binaryPath = builder.binaryPath;
-			resolveFullBinaryPathAndCheckVersion();
+			this.ideaProperties = new TreeMap<>(builder.ideaProperties);
+			this.binaryPath = resolveFullBinaryPathAndCheckVersion(builder.binaryPath);
 		}
 
-		private void resolveFullBinaryPathAndCheckVersion() {
+		private static String resolveFullBinaryPathAndCheckVersion(String binaryPath) {
 			var exe = ForeignExe
-					.nameAndVersion(this.binaryPath, "IntelliJ IDEA")
-					.pathToExe(pathToExe())
+					.nameAndVersion(binaryPath, "IntelliJ IDEA")
+					.pathToExe(pathToExe(binaryPath))
 					.versionRegex(Pattern.compile("(IntelliJ IDEA) .*"))
 					.fixCantFind(
 							"IDEA executable cannot be found on your machine, "
@@ -120,7 +150,7 @@ private void resolveFullBinaryPathAndCheckVersion() {
 					.fixWrongVersion("Provided binary is not IDEA, "
 							+ "please check it and fix the problem; or report the problem");
 			try {
-				this.binaryPath = exe.confirmVersionAndGetAbsolutePath();
+				return exe.confirmVersionAndGetAbsolutePath();
 			} catch (IOException e) {
 				throw new IllegalArgumentException("binary cannot be found", e);
 			} catch (InterruptedException e) {
@@ -130,10 +160,7 @@ private void resolveFullBinaryPathAndCheckVersion() {
 		}
 
 		@CheckForNull
-		private String pathToExe() {
-			if (binaryPath == null) {
-				throw new IllegalStateException("binaryPath is not set");
-			}
+		private static String pathToExe(String binaryPath) {
 			return macOsFix(binaryPath);
 		}
 
@@ -177,7 +204,8 @@ public String applyWithFile(String unix, File file) throws Exception {
 				List<String> params = getParams(tempFile);
 
 				try (ProcessRunner runner = new ProcessRunner()) {
-					var result = runner.exec(params);
+					Map<String, String> env = createEnv();
+					var result = runner.exec(null, env, null, params);
 					LOGGER.debug("command finished with stdout: {}",
 							result.assertExitZero(StandardCharsets.UTF_8));
 
@@ -188,6 +216,38 @@ public String applyWithFile(String unix, File file) throws Exception {
 			}
 		}
 
+		private Map<String, String> createEnv() {
+			File ideaProps = createIdeaPropertiesFile();
+			Map<String, String> env = Map.ofEntries(
+					Map.entry("IDEA_PROPERTIES", ThrowingEx.get(ideaProps::getCanonicalPath)));
+			return env;
+		}
+
+		private File createIdeaPropertiesFile() {
+			Path ideaProps = new File(buildDir).toPath().resolve(uniquePath).resolve("idea.properties");
+
+			if (Files.exists(ideaProps)) {
+				return ideaProps.toFile(); // only create if it does not exist
+			}
+
+			ThrowingEx.run(() -> Files.createDirectories(ideaProps.getParent()));
+
+			Path configPath = ideaProps.getParent().resolve("config");
+			Path systemPath = ideaProps.getParent().resolve("system");
+
+			Properties properties = new Properties();
+			properties.putAll(ideaProperties);
+			properties.put(IDEA_CONFIG_PATH_PROPERTY, ThrowingEx.get(configPath.toFile()::getCanonicalPath));
+			properties.put(IDEA_SYSTEM_PATH_PROPERTY, ThrowingEx.get(systemPath.toFile()::getCanonicalPath));
+
+			try (FileOutputStream out = new FileOutputStream(ideaProps.toFile())) {
+				properties.store(out, "Generated by spotless");
+			} catch (IOException e) {
+				throw new IllegalStateException("Failed to create IDEA properties file", e);
+			}
+			return ideaProps.toFile();
+		}
+
 		private List<String> getParams(File file) {
 			/* https://www.jetbrains.com/help/idea/command-line-formatter.html */
 			var builder = Stream.<String> builder();
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 ab93e53881..b1f8cb9d6b 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
@@ -969,7 +969,7 @@ public class IdeaConfig {
 		private final IdeaStep.IdeaStepBuilder builder;
 
 		IdeaConfig() {
-			this.builder = IdeaStep.create();
+			this.builder = IdeaStep.create(getProject().getLayout().getBuildDirectory().getAsFile().get());
 			addStep(createStep());
 		}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
index 67a4d5b556..ab9de41a08 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
@@ -35,7 +35,7 @@ public class Idea implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		return IdeaStep.create()
+		return IdeaStep.create(config.getFileLocator().getBuildDir())
 				.setUseDefaults(withDefaults)
 				.setCodeStyleSettingsPath(configPath)
 				.setBinaryPath(binaryPath)
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
index 328d9f934e..05b643805e 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
@@ -24,6 +24,7 @@
 import com.diffplug.common.io.Files;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.ThrowingEx;
 import com.diffplug.spotless.tag.IdeaTest;
 
 @IdeaTest
@@ -31,7 +32,7 @@ class IdeaStepTest extends ResourceHarness {
 
 	@Test
 	void name() throws Exception {
-		FormatterStep step = IdeaStep.create().setUseDefaults(true).setBinaryPath("idea").build();
+		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(true).build();
 
 		String name = step.getName();
 
@@ -43,7 +44,7 @@ void notFormattings() throws Exception {
 		File cleanFile = newFile("clean.java");
 		String cleanJava = ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create().setUseDefaults(true).setBinaryPath("/Users/simschla/Applications/IntelliJ IDEA Ultimate.app/Contents/MacOS/idea").build();
+		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(true).build();
 
 		var result = step.format(cleanJava, cleanFile);
 
@@ -56,7 +57,7 @@ void formattings() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create().setUseDefaults(true).setBinaryPath("/Users/simschla/Applications/IntelliJ IDEA Ultimate.app/Contents/MacOS/idea").build();
+		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(true).build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -69,7 +70,7 @@ void formattingsWorkWithDefaultParameters() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create().build();
+		FormatterStep step = IdeaStep.create(buildDir()).build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -82,7 +83,7 @@ void formattingsWithOutDefaultDoesNothing() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create().setUseDefaults(false).setBinaryPath("idea").build();
+		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(false).build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -95,11 +96,20 @@ void configureFile() throws Exception {
 		File cleanFile = newFile("clean.java");
 		String cleanJava = ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create().setUseDefaults(true).setBinaryPath("idea").build();
+		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(true).build();
 
 		var result = step.format(cleanJava, cleanFile);
 
 		Assertions.assertEquals(cleanJava, result,
 				"formatting was applied to clean file");
 	}
+
+	private File buildDir = null;
+
+	protected File buildDir() {
+		if (this.buildDir == null) {
+			this.buildDir = ThrowingEx.get(() -> newFolder("build-dir"));
+		}
+		return this.buildDir;
+	}
 }

From 619051c723ff4428251496ccf22b828a0f203014 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 13 May 2025 20:18:22 +0200
Subject: [PATCH 139/210] chore: fix formatter to use UTF-8 (as asserted by
 spotless)

---
 lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index 066e47577f..7c76bb8aa1 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -260,6 +260,7 @@ private List<String> getParams(File file) {
 				builder.add("-s");
 				builder.add(codeStyleSettingsPath);
 			}
+			builder.add("-charset").add("UTF-8");
 			builder.add(ThrowingEx.get(file::getCanonicalPath));
 			return builder.build().collect(Collectors.toList());
 		}

From 0570c6af0575664bac88951418ac6c4aff3c0bdc Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Tue, 13 May 2025 21:08:39 +0200
Subject: [PATCH 140/210] feat: allow specifying idea execs not on path

---
 .gitignore                                    |  1 +
 gradle/special-tests.gradle                   |  4 +
 .../diffplug/spotless/generic/IdeaStep.java   | 19 ++--
 .../spotless/generic/TestEnvVars.java         | 93 +++++++++++++++++++
 4 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java

diff --git a/.gitignore b/.gitignore
index 2f8c81aca6..28ce16fa21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 # Project-specific stuff
 userHome/
 workspace/
+testenv.properties
 
 ### Gradle ###
 .gradle
diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index 29295b19ec..1931043e42 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -38,5 +38,9 @@ tasks.named('test').configure {
 special.forEach { tag ->
 	tasks.register("test${tag.capitalize()}", Test) {
 		useJUnitPlatform { includeTags tag }
+		if (rootProject.file('testenv.properties').exists()) {
+			systemProperty 'testenv.properties.path', rootProject.file('testenv.properties').canonicalPath
+		}
 	}
 }
+
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index 7c76bb8aa1..b758b0e6d4 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -161,17 +161,22 @@ private static String resolveFullBinaryPathAndCheckVersion(String binaryPath) {
 
 		@CheckForNull
 		private static String pathToExe(String binaryPath) {
-			return macOsFix(binaryPath);
+			String testEnvBinaryPath = TestEnvVars.read().get(String.format("%s.%s", IdeaStep.class.getName(), "binaryPath"));
+			if (testEnvBinaryPath != null) {
+				return testEnvBinaryPath;
+			}
+			if (isMacOs()) {
+				return macOsFix(binaryPath);
+			}
+			if (new File(binaryPath).exists()) {
+				return binaryPath;
+			}
+			return null; // search in PATH
 		}
 
 		@CheckForNull
 		private static String macOsFix(String binaryPath) {
-			if (!isMacOs()) {
-				if (new File(binaryPath).exists()) {
-					return binaryPath;
-				}
-				return null; // search in PATH
-			}
+
 			// on macOS, the binary is located in the .app bundle which might be invisible to the user
 			// we try need to append the path to the binary
 			File binary = new File(binaryPath);
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java b/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java
new file mode 100644
index 0000000000..c0966c511f
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java
@@ -0,0 +1,93 @@
+/*
+ * 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.generic;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import javax.annotation.Nullable;
+
+class TestEnvVars {
+
+	private final Map<String, String> envVars;
+
+	private static TestEnvVars INSTANCE;
+
+	private TestEnvVars(Map<String, String> envVars) {
+		this.envVars = Map.copyOf(envVars);
+	}
+
+	public static synchronized TestEnvVars read() {
+		if (INSTANCE == null) {
+			INSTANCE = new TestEnvVars(readTestEnvVars());
+		}
+		return INSTANCE;
+	}
+
+	private static Map<String, String> readTestEnvVars() {
+		Map<String, String> envVars = new HashMap<>();
+		Optional<Path> resolvedTestenvProps = candidateTestEnvLocations().filter(Files::exists).findFirst();
+		resolvedTestenvProps.ifPresent(testenvProps -> {
+			try (var reader = Files.newBufferedReader(testenvProps)) {
+				java.util.Properties properties = new java.util.Properties();
+				properties.load(reader);
+				for (String name : properties.stringPropertyNames()) {
+					envVars.put(name, properties.getProperty(name));
+				}
+			} catch (IOException e) {
+				throw new RuntimeException("Failed to read test environment variables", e);
+			}
+		});
+		return envVars;
+	}
+
+	private static Stream<Path> candidateTestEnvLocations() {
+		Stream.Builder<Path> builder = Stream.builder();
+		if (System.getProperty("testenv.properties.path") != null) {
+			builder.add(Path.of(System.getProperty("testenv.properties.path")));
+		}
+		builder.add(
+				Path.of(System.getProperty("user.dir"), "testenv.properties"));
+		builder.add(
+				Path.of(System.getProperty("user.dir")).getParent().resolve("testenv.properties"));
+		return builder.build();
+	}
+
+	public @Nullable String get(String key) {
+		return envVars.get(key);
+	}
+
+	public String getOrDefault(String key, String defaultValue) {
+		return envVars.getOrDefault(key, defaultValue);
+	}
+
+	public String getOrThrow(String key) {
+		String value = envVars.get(key);
+		if (value == null) {
+			throw new IllegalArgumentException("Environment variable " + key + " not found");
+		}
+		return value;
+	}
+
+	public boolean hasKey(String key) {
+		return envVars.containsKey(key);
+	}
+}

From 1027acacaf7196a8d61beeb49111620ab98ad63c Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 16 May 2025 20:49:35 +0200
Subject: [PATCH 141/210] refactor: turn ideastep into autoclosable
 implementation

---
 .../diffplug/spotless/generic/IdeaStep.java   | 73 +++++++++++++------
 1 file changed, 51 insertions(+), 22 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index b758b0e6d4..7adbd12762 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -65,8 +65,7 @@ public static IdeaStepBuilder create(@Nonnull File buildDir) {
 	private static FormatterStep create(@Nonnull IdeaStepBuilder builder) {
 		Objects.requireNonNull(builder);
 		return FormatterStep.createLazy(NAME,
-				() -> createState(builder),
-				state -> state);
+				() -> createState(builder), State::toFunc);
 	}
 
 	private static State createState(@Nonnull IdeaStepBuilder builder) {
@@ -117,22 +116,19 @@ public FormatterStep build() {
 		}
 	}
 
-	private static class State
-			implements FormatterFunc.NeedsFile, Serializable {
+	private static class State implements Serializable {
 
-		private static final long serialVersionUID = -1825662355363926318L;
+		private static final long serialVersionUID = -1426311255869303398L;
 
-		private final String buildDir;
-		private final String uniquePath;
+		private final File uniqueBuildFolder;
 		private final String binaryPath;
 		@Nullable
-		private final String codeStyleSettingsPath; // TODO make sure to save content in state
+		private final String codeStyleSettingsPath;
 		private final boolean withDefaults;
 		private final TreeMap<String, String> ideaProperties;
 
 		private State(@Nonnull IdeaStepBuilder builder) {
-			this.buildDir = ThrowingEx.get(builder.buildDir::getCanonicalPath);
-			this.uniquePath = UUID.randomUUID().toString();
+			this.uniqueBuildFolder = new File(builder.buildDir, UUID.randomUUID().toString());
 			this.withDefaults = builder.useDefaults;
 			this.codeStyleSettingsPath = builder.codeStyleSettingsPath;
 			this.ideaProperties = new TreeMap<>(builder.ideaProperties);
@@ -174,7 +170,6 @@ private static String pathToExe(String binaryPath) {
 			return null; // search in PATH
 		}
 
-		@CheckForNull
 		private static String macOsFix(String binaryPath) {
 
 			// on macOS, the binary is located in the .app bundle which might be invisible to the user
@@ -200,22 +195,18 @@ private static boolean isMacOs() {
 			return System.getProperty("os.name").toLowerCase().contains("mac");
 		}
 
-		@Override
-		public String applyWithFile(String unix, File file) throws Exception {
+		private String format(IdeaStepFormatterCleanupResources ideaStepFormatterCleanupResources, String unix, File file) throws Exception {
 			// since we cannot directly work with the file, we need to write the unix string to a temporary file
 			File tempFile = File.createTempFile("spotless", file.getName());
 			try {
 				Files.write(tempFile.toPath(), unix.getBytes(StandardCharsets.UTF_8));
 				List<String> params = getParams(tempFile);
 
-				try (ProcessRunner runner = new ProcessRunner()) {
-					Map<String, String> env = createEnv();
-					var result = runner.exec(null, env, null, params);
-					LOGGER.debug("command finished with stdout: {}",
-							result.assertExitZero(StandardCharsets.UTF_8));
-
-					return Files.readString(tempFile.toPath(), StandardCharsets.UTF_8);
-				}
+				Map<String, String> env = createEnv();
+				var result = ideaStepFormatterCleanupResources.runner.exec(null, env, null, params);
+				LOGGER.debug("command finished with stdout: {}",
+						result.assertExitZero(StandardCharsets.UTF_8));
+				return Files.readString(tempFile.toPath(), StandardCharsets.UTF_8);
 			} finally {
 				Files.delete(tempFile.toPath());
 			}
@@ -229,7 +220,7 @@ private Map<String, String> createEnv() {
 		}
 
 		private File createIdeaPropertiesFile() {
-			Path ideaProps = new File(buildDir).toPath().resolve(uniquePath).resolve("idea.properties");
+			Path ideaProps = this.uniqueBuildFolder.toPath().resolve("idea.properties");
 
 			if (Files.exists(ideaProps)) {
 				return ideaProps.toFile(); // only create if it does not exist
@@ -269,5 +260,43 @@ private List<String> getParams(File file) {
 			builder.add(ThrowingEx.get(file::getCanonicalPath));
 			return builder.build().collect(Collectors.toList());
 		}
+
+		private FormatterFunc.Closeable toFunc() {
+			IdeaStepFormatterCleanupResources ideaStepFormatterCleanupResources = new IdeaStepFormatterCleanupResources(uniqueBuildFolder, new ProcessRunner());
+			return FormatterFunc.Closeable.of(ideaStepFormatterCleanupResources, this::format);
+		}
+	}
+
+	private static class IdeaStepFormatterCleanupResources implements AutoCloseable {
+		@Nonnull
+		private final File uniqueBuildFolder;
+		@Nonnull
+		private final ProcessRunner runner;
+
+		public IdeaStepFormatterCleanupResources(@Nonnull File uniqueBuildFolder, @Nonnull ProcessRunner runner) {
+			this.uniqueBuildFolder = uniqueBuildFolder;
+			this.runner = runner;
+		}
+
+		@Override
+		public void close() throws Exception {
+			// close the runner
+			runner.close();
+			// delete the unique build folder
+			if (uniqueBuildFolder.exists()) {
+				// delete the unique build folder recursively
+				try (Stream<Path> paths = Files.walk(uniqueBuildFolder.toPath())) {
+					paths.sorted((o1, o2) -> o2.compareTo(o1)) // delete files first
+							.forEach(path -> {
+								try {
+									Files.delete(path);
+								} catch (IOException e) {
+									LOGGER.warn("Failed to delete file: {}", path, e);
+								}
+							});
+				}
+			}
+		}
+
 	}
 }

From 7b2b21cc66feabaca446d506d079d557d624be75 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 18 May 2025 21:40:54 +0200
Subject: [PATCH 142/210] refactor: adapt creation pipeline to allow createLazy
 to work with function pointers

---
 .../diffplug/spotless/generic/IdeaStep.java   | 38 +++++++++++++++----
 .../gradle/spotless/FormatExtension.java      |  2 +-
 .../diffplug/spotless/maven/generic/Idea.java |  2 +-
 .../spotless/generic/IdeaStepTest.java        | 12 +++---
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index 7adbd12762..fd975e4df4 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -48,27 +48,34 @@
 
 public final class IdeaStep {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(IdeaStep.class);
+
 	public static final String NAME = "IDEA";
 
 	public static final String IDEA_EXECUTABLE_DEFAULT = "idea";
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IdeaStep.class);
 	public static final String IDEA_CONFIG_PATH_PROPERTY = "idea.config.path";
 	public static final String IDEA_SYSTEM_PATH_PROPERTY = "idea.system.path";
+	@Nonnull
+	private final IdeaStepBuilder builder;
 
-	private IdeaStep() {}
+	private IdeaStep(@Nonnull IdeaStepBuilder builder) {
+		this.builder = builder;
+	}
 
-	public static IdeaStepBuilder create(@Nonnull File buildDir) {
+	public static IdeaStepBuilder newBuilder(@Nonnull File buildDir) {
 		return new IdeaStepBuilder(Objects.requireNonNull(buildDir));
 	}
 
-	private static FormatterStep create(@Nonnull IdeaStepBuilder builder) {
-		Objects.requireNonNull(builder);
-		return FormatterStep.createLazy(NAME,
-				() -> createState(builder), State::toFunc);
+	private static FormatterStep create(IdeaStepBuilder builder) {
+		return new IdeaStep(builder).createFormatterStep();
 	}
 
-	private static State createState(@Nonnull IdeaStepBuilder builder) {
+	private FormatterStep createFormatterStep() {
+		return FormatterStep.createLazy(NAME, this::createState, State::toFunc);
+	}
+
+	private State createState() {
 		return new State(Objects.requireNonNull(builder));
 	}
 
@@ -114,6 +121,17 @@ public IdeaStepBuilder setIdeaProperties(@Nonnull Map<String, String> ideaProper
 		public FormatterStep build() {
 			return create(this);
 		}
+
+		@Override
+		public String toString() {
+			return String.format(
+					"IdeaStepBuilder[useDefaults=%s, binaryPath=%s, codeStyleSettingsPath=%s, ideaProperties=%s, buildDir=%s]",
+					this.useDefaults,
+					this.binaryPath,
+					this.codeStyleSettingsPath,
+					this.ideaProperties,
+					this.buildDir);
+		}
 	}
 
 	private static class State implements Serializable {
@@ -128,6 +146,7 @@ private static class State implements Serializable {
 		private final TreeMap<String, String> ideaProperties;
 
 		private State(@Nonnull IdeaStepBuilder builder) {
+			LOGGER.debug("Creating {} state with configuration {}", NAME, builder);
 			this.uniqueBuildFolder = new File(builder.buildDir, UUID.randomUUID().toString());
 			this.withDefaults = builder.useDefaults;
 			this.codeStyleSettingsPath = builder.codeStyleSettingsPath;
@@ -203,7 +222,9 @@ private String format(IdeaStepFormatterCleanupResources ideaStepFormatterCleanup
 				List<String> params = getParams(tempFile);
 
 				Map<String, String> env = createEnv();
+				LOGGER.info("Launching IDEA formatter for orig file {} with params: {} and env: {}", file, params, env);
 				var result = ideaStepFormatterCleanupResources.runner.exec(null, env, null, params);
+				LOGGER.debug("command finished with exit code: {}", result.exitCode());
 				LOGGER.debug("command finished with stdout: {}",
 						result.assertExitZero(StandardCharsets.UTF_8));
 				return Files.readString(tempFile.toPath(), StandardCharsets.UTF_8);
@@ -236,6 +257,7 @@ private File createIdeaPropertiesFile() {
 			properties.put(IDEA_CONFIG_PATH_PROPERTY, ThrowingEx.get(configPath.toFile()::getCanonicalPath));
 			properties.put(IDEA_SYSTEM_PATH_PROPERTY, ThrowingEx.get(systemPath.toFile()::getCanonicalPath));
 
+			LOGGER.debug("Creating IDEA properties file at {} with content: {}", ideaProps, properties);
 			try (FileOutputStream out = new FileOutputStream(ideaProps.toFile())) {
 				properties.store(out, "Generated by spotless");
 			} catch (IOException e) {
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 b1f8cb9d6b..f457500ee7 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
@@ -969,7 +969,7 @@ public class IdeaConfig {
 		private final IdeaStep.IdeaStepBuilder builder;
 
 		IdeaConfig() {
-			this.builder = IdeaStep.create(getProject().getLayout().getBuildDirectory().getAsFile().get());
+			this.builder = IdeaStep.newBuilder(getProject().getLayout().getBuildDirectory().getAsFile().get());
 			addStep(createStep());
 		}
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
index ab9de41a08..0e09b8f1a7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
@@ -35,7 +35,7 @@ public class Idea implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		return IdeaStep.create(config.getFileLocator().getBuildDir())
+		return IdeaStep.newBuilder(config.getFileLocator().getBuildDir())
 				.setUseDefaults(withDefaults)
 				.setCodeStyleSettingsPath(configPath)
 				.setBinaryPath(binaryPath)
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
index 05b643805e..fad95e10f4 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
@@ -32,7 +32,7 @@ class IdeaStepTest extends ResourceHarness {
 
 	@Test
 	void name() throws Exception {
-		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(true).build();
+		FormatterStep step = IdeaStep.newBuilder(buildDir()).setUseDefaults(true).build();
 
 		String name = step.getName();
 
@@ -44,7 +44,7 @@ void notFormattings() throws Exception {
 		File cleanFile = newFile("clean.java");
 		String cleanJava = ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(true).build();
+		FormatterStep step = IdeaStep.newBuilder(buildDir()).setUseDefaults(true).build();
 
 		var result = step.format(cleanJava, cleanFile);
 
@@ -57,7 +57,7 @@ void formattings() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(true).build();
+		FormatterStep step = IdeaStep.newBuilder(buildDir()).setUseDefaults(true).build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -70,7 +70,7 @@ void formattingsWorkWithDefaultParameters() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(buildDir()).build();
+		FormatterStep step = IdeaStep.newBuilder(buildDir()).build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -83,7 +83,7 @@ void formattingsWithOutDefaultDoesNothing() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(false).build();
+		FormatterStep step = IdeaStep.newBuilder(buildDir()).setUseDefaults(false).build();
 
 		var result = step.format(dirtyJava, dirtyFile);
 
@@ -96,7 +96,7 @@ void configureFile() throws Exception {
 		File cleanFile = newFile("clean.java");
 		String cleanJava = ResourceHarness.getTestResource("java/idea/full.clean.java");
 		Files.write(cleanJava, cleanFile, StandardCharsets.UTF_8);
-		FormatterStep step = IdeaStep.create(buildDir()).setUseDefaults(true).build();
+		FormatterStep step = IdeaStep.newBuilder(buildDir()).setUseDefaults(true).build();
 
 		var result = step.format(cleanJava, cleanFile);
 

From 412430deb47dd0126e90bef6d37d686244663513 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 19 May 2025 21:01:25 +0200
Subject: [PATCH 143/210] chore: add testIdea to ci

---
 .github/workflows/ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5de52b4d9..051f9802c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,6 +59,9 @@ jobs:
             jre: 11
             os: ubuntu-latest
             shfmt-version: v3.8.0
+          - kind: idea
+            jre: 11
+            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -91,6 +94,16 @@ jobs:
       - name: Test shfmt
         if: matrix.kind == 'shfmt'
         run: ./gradlew testShfmt
+      - name: Test idea
+        if: matrix.kind == 'idea'
+        run: |
+          download_link=$(curl https://data.services.jetbrains.com/products/releases\?code\=IIC\&latest\=true\&type\=release | jq -r '.IIC[0].downloads.linux.link')
+          curl --location "$download_link" -o idea.tar.gz
+          tar -xf idea.tar.gz
+          cd idea-IC*
+          export PATH=${PATH}:$(pwd)/bin
+          cd ..
+          ./gradlew testIdea
       - name: junit result
         uses: mikepenz/action-junit-report@v5
         if: always() # always run even if the previous step fails

From b686a1c56248314dfeedeed94a012c167fca9773 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 20 Jun 2025 21:40:41 +0200
Subject: [PATCH 144/210] docs: start documenting idea usage

---
 plugin-gradle/README.md | 42 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 7a2c6b42b7..148f01bcce 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -55,7 +55,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [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))
+  - [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), [IntelliJ IDEA](#intellij-idea))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))
@@ -65,7 +65,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
   - [FreshMark](#freshmark) aka markdown
   - [Flexmark](#flexmark) aka markdown
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
-  - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier))
+  - [SQL](#sql) ([dbeaver](#dbeaver), [prettier](#prettier), [IntelliJ IDEA](#intellij-idea))
   - [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))
@@ -78,6 +78,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
     - [clang-format](#clang-format)
     - [eclipse web tools platform](#eclipse-web-tools-platform)
     - [Biome](#biome) ([binary detection](#biome-binary), [config file](#biome-configuration-file), [input language](#biome-input-language))
+    - [IntelliJ IDEA](#intellij-idea)
 - **Language independent**
   - [Generic steps](#generic-steps)
   - [License header](#license-header) ([slurp year from git](#retroactively-slurp-years-from-git-history))
@@ -198,6 +199,7 @@ spotless {
     eclipse()            // has its own section below
     prettier()           // has its own section below
     clangFormat()        // has its own section below
+    idea()               // has its own section below
 
     formatAnnotations()  // fixes formatting of type annotations, see below
 
@@ -754,6 +756,7 @@ spotless {
 
     dbeaver()  // has its own section below
     prettier() // has its own section below
+    idea()     // has its own section below
   }
 }
 ```
@@ -1581,9 +1584,42 @@ The following languages are currently recognized:
 * `ts?` -- TypeScript, with or without JSX, depending on the file extension
 * `json` -- JSON
 
+## IntelliJ IDEA
+
+[homepage](https://www.jetbrains.com/idea/). [changelog](https://www.jetbrains.com/idea/whatsnew/). 
+
+`IntelliJ IDEA` is a powerful IDE for java, kotlin and many more languages. There are [specific variants](https://www.jetbrains.com/products/) for almost any modern language
+and a plethora of [plugins](https://plugins.jetbrains.com/).
+
+Spotless provides access to IntelliJ IDEA's command line formatter. 
+
+
+```gradle
+spotless {
+  format 'myFormatter', {
+    // you have to set the target manually
+    target 'src/main/**/*.java','jbang/*.java'
+
+    idea()
+      .codeStyleSettingsPath('/path/to/config') // if you have custom formatting rules, see below for how to get them
+      .withDefaults(true) // Use the default code style settings when the code style is not defined for a file type (default: true)
+
+    // if idea is not on your path, you must specify the path to the executable
+    idea().binaryPath('/path/to/idea')
+  }
+}
+```
+
+### How to generate code style settings files
+TODO
+
+### Limitations
+- Currently, only IntelliJ IDEA is supported - none of the other jetbrains IDE. Consider opening a PR if you want to change this.
+- Launching IntelliJ IDEA from the command line is pretty expensive and as of now, we do this for each file. If you want to change this, consider opening a PR.
+
 ## 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:
+[Prettier](#prettier), [eclipse wtp](#eclipse-web-tools-platform), [IntelliJ IDEA](#intellij-idea) 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:
 
 ```gradle
 spotless {

From 3277660331bf2945ccf8e786461410d12b7f37c1 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Fri, 20 Jun 2025 21:40:58 +0200
Subject: [PATCH 145/210] chore: adapt api for idea step

---
 .../java/com/diffplug/gradle/spotless/FormatExtension.java     | 3 +--
 1 file changed, 1 insertion(+), 2 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 f457500ee7..3b96a85394 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
@@ -984,8 +984,7 @@ public IdeaConfig binaryPath(String binaryPath) {
 			return this;
 		}
 
-		// TODO (simschla, 11.05.2025): rename
-		public IdeaConfig configPath(String configPath) {
+		public IdeaConfig codeStyleSettingsPath(String configPath) {
 			requireNonNull(configPath);
 			builder.setCodeStyleSettingsPath(configPath);
 			replaceStep(createStep());

From 6d71e4d594528ad13a15a4a5f7d07fe7c78d3e60 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 25 Jun 2025 20:17:02 +0200
Subject: [PATCH 146/210] docs: add documentation for IntelliJ codestyle

---
 INTELLIJ_IDEA_SCREENSHOTS.md          |  16 +++++++++
 _images/intellij_export_codestyle.png | Bin 0 -> 133848 bytes
 plugin-gradle/README.md               |   7 ++--
 plugin-maven/README.md                |  49 +++++++++++++++++++++++---
 4 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 INTELLIJ_IDEA_SCREENSHOTS.md
 create mode 100644 _images/intellij_export_codestyle.png

diff --git a/INTELLIJ_IDEA_SCREENSHOTS.md b/INTELLIJ_IDEA_SCREENSHOTS.md
new file mode 100644
index 0000000000..31e264b5ea
--- /dev/null
+++ b/INTELLIJ_IDEA_SCREENSHOTS.md
@@ -0,0 +1,16 @@
+# Extracting Code Style from IntelliJ IDEA
+
+## 1. Exporting Code Style Settings to a file
+To export code style settings from IntelliJ IDEA to a file, go to
+`Settings | Editor | Code Style` and click on the gear icon next to the scheme name.
+
+![Exporting code style settings](_images/intellij_export_codestyle.png)
+
+## 2. Using IntelliJ's active code style directly
+If you have your code style settings checked into version control (in your `.idea` directory), 
+you can use the active code style directly in Spotless without exporting it to a file. 
+The file can be found at `.idea/codeStyles/Project.xml`.
+
+## Upstream documentation
+More details can be found in the [IntelliJ IDEA documentation](https://www.jetbrains.com/help/idea/command-line-formatter.html#options)
+for the command line formatter, which is what Spotless uses under the hood.
diff --git a/_images/intellij_export_codestyle.png b/_images/intellij_export_codestyle.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0c98d2cdbd1b987c118a1ebeabc536fc6d1d1a8
GIT binary patch
literal 133848
zcmZ^L1z1#D_ctI)DWwe3-7!dar*t<c-Q6jm5+e;Wba!`$N(n=!G}1L7-SCa~dVS;n
ze$R7eW}mb7*?a9;Ywh1!Yr<8OWS*fDq9Y(6Jd=}^R6{^`G>(9PG>G~H{sfgbA_)G2
z=&B|oj!-d7yaT_HG}n={P*g-<{FRS@7;24x{HqB3LkR!CU(Z5Bcm)4N{Pipg>7U$3
z<5`dXNh1yZD!9L${SpB|6hTf>Ov4LtKOM#IMGt<TF*)`7lu>!|?2A#~L)pr4Rb;&C
zpkPD92S##kY$;}XN^(lnh*QS)izR{gU}RZY@vjf<x|<G%E|7I`RQzKi;pWBkhT7%D
zm>ZbyNpG$P%;LgfsZA<7`|S%75=B{Z1f>7IVy4l|zOBg3)>;-CG`py6pUJyzt}_h8
zz2Y!G>lY`bd99%(&R;I^^(+Jd_1%A6?}UQNbZb=_>}Kg{cWKiF+*4f4j;NHYrKy7c
ztK?s|-8AGWS4%=UZQds_+6D422uY=PR<$HB|4+T}((h=U_P`3EnEA(InheZH;(D%M
z0LY>U|9z$5qN1VYr#4c4o0-7^SQjR!{L{neFwxDyWO|8@PouZ@d0GBx;~f=}=iySm
zexpMz$P@9{O+)NhP*BiI++AxRf#JEgH$mWFZcYw^pkUh9uMRcQyaM5^F$?V?_^gjL
z#r|r2oF4H?AIxEid3<t`4~2wGEqAR;#{!K>33-1qoQ3*)eSb*L&CT7c9CZJO+&Ecs
zO3GmL^`RXdSzn)mLP782n8rqk;spVRPyDUfa9VP3NXX8?;>%PQOO%79%vxtEvfn-B
zL=1cgo-EgwIg8WXGHh~+y}vZgNa4soNwd%QuQrj=@e3UrPWRQ|0s?_0hOHmxmOK0l
zaYy)EE>*8jcc#489UZ*9-q*6mV*NAoF<+6po6=a@Ee&QIyyp*OB~$z8ko0$D7vIOV
zUO+}KRWW~;tcfyP?hs07iv08`M;^k;B<~!AbX9CSa~_VQQS~OkX0nKMs#JSk&G<g!
zb;hk(f1K_H8K29i&5;L)#ZU?cjy=T(5^My-UzZaWQg!vKge49M15jOAthr;j2d7yv
zm3z;SK*##QT@Q~(!tWLH4x8SfDaJfy!m)EG$8~F1Jsh{E$Q)X5%QKO>#o?>wc4}Cn
zSC6Y%K`eQ7ypg{*<2d@GOU8Ptq+X*~?Qx0mGWMv6bHGmimPWut!87J}t)7QD%u{_)
z=_)1yw6xOo5Dz>itt{J_iW4^`vZ;$?jxDRZYel!!Zid$oRuV4j@ptfbkl)rDMJlA!
z?6R?b_o>e7$b~=PmU^m4HL*maxM*SAaT&94qHtt%JfA7?@d7)-{-1q8ElbXQo?%MC
z;xHessK!G<0Xw*(IoDIg`fE1HVYo3gK)2n6W)>1&r=;P`PEnCtwnR!QD$Q8bsRn!f
z;yVm{R@H+AzC?1s1*}xNlEKrS;YAShm)Gl&4SeC`0EmP07TEhc|JBu1v1$KvPj+Qx
zWkx;Dm>SCw>F0C-%Fl?Vb6ebPi+4>}@W;yI+fFf`GAoqpajEO}MUfQVUY)3ZK;QUY
z%1knp%weqE^Jhnq;~=~3$MJsY#WjtbzN0H}FxeFxxIb;Ke*D+;As|{Jvl@5gFn@O6
zom>|+4FLRL%(?7*m_8YKV(tz;HwibYwIE4k(SIGThtpu%7f{UHM`<M?(Y4)rSWu*%
zF5nqt<O`#z7jfOR^B};|qSQ72?!VCF973y@B2FU@u=G5}1ZP?1%R^MSdahXxRw!$3
zPInxvS%Su>`^oO%V?Dmqj-neQGd7eu4S56}_>TCSE^OHsLA>Jps^tgTE?h32;{L6^
zfoPFr8-H`TXkgF=RC}U8QNP&hC`Y3xMx<2@LQO_SX0y<Q2%Gm*X*PgPf%ZH`G7MSB
z*FV%`JlORsd>#IP0h#p|Oc~A)vb1KIwl+4FpwATa)+;Z{Zsd;&N40Z?4X5&8aoNww
z*5g6XBJfHRH5bPTJpOEVTt)Jz7_dmisunnjn$-f0#`6%EeUwZ5drJ=_GL?5*Np_Q5
zpNx3d+0Gbw915FN-$tllVs?l>#sItl9U|(r`>>1@pPPI!RAC`vIEizQ^ONb<?Wow>
zH$O>a>h%r@9*7Uyj-vt1B0s`|90lI%4h9PdRJO#*4Xq8w(>11Ox4Z9QE($gLVfU=q
zVN`kM>D%4t*2SqRE*JN>gdzifvoujrB!9WjujGK8f?*W~&9Cq8A5R{^C+&NUZ!9LM
zV9tBDt7CJGH|%JaG$$!NH2RwwAo)gWoW+nQLJ}AN<{$M%z*4?x+^RDDMkV5R`y%LQ
zXqsoZH`Ue?+`HrXLU{Bs(MDcxMbj)Ot5Uga^ENFG7h9LrSXsCKC6DANoPY<%+PH!W
zW#7<fs-@{(SSegP!HH~9O86~!-VGXNaBMk7goUZdzv=fGr3{c#QBLPq57!9KX?IwZ
z)-2R0#(ga*FIofN)btSB@B)@E9cC3ZO{P$J+wjwNpEG`%0vgIjoho<i=j~IcJ>~PN
zbB%`ximB%U_VW$#=Z7Ma@a?C`x}v6C_T9vNsol5IMz2^68)%%IO8s(9<bl~`lH~Yb
zvrN4rMtXIe*koxuGQr{BW-A98#l*ziEXr-bk%8Te^}!iADcwI45QB{v4rZa`W!?wl
z4n^%+LcyBt3DY?3L++;w=DynY;on)lKn)ZPTRk*R>U+MnIj;et#z{V_HbYAsdZRPV
zs-5H?D5p0Zn~;elkp3)wLd2tU7y7(>fh!51F|yeeqb`|xTpM4f|4l;;`+Ojx3f}4!
zd=ys+_#=MP{n;Mv@&-T8sJ*4+v*o5(#0LYUJc>Wkni?47^}+2p1HJvvBSB^)6KgQv
z0<MAr^DsWph%$L568VoTxkZ+g?L*@R-xi8R|5<8S@uFT{$Rzx3>u)oV{Qu|;NvL@o
zFjM^h7U91LBS%ES9!EnEfAx=;{x|hO2aQ+fen2lw=(jBSTcZ5)t&c?NJQLec{*LN@
zW^*7md8Asu`A3@mnLK!6l?Gwv!0RXr`+pE*hxWOC9*h$8@8y4|;iNjjln}5Z#6BCM
zdU;<pK~>l=|D$c$31srTiBni#&!4XU5fDw%2(EdCYaizR4A!57bsEB^Y~c|K0_2aV
z{zsP~UtxszqxJREv)>!`-}InyHh5OykJM;+lz*1RKVyUKl#XD~YH0Zp@TZYK3F{Pi
z*8iW#ip7c}ar^)1)~{NFIF%6qJDd-waOL+;pMEFaF(C_*Xr7;+XS?l;t1Bpc$~9Ss
zuOjN_L8m(t>UMTdrKF{))uXqc{O5SD{J{O0#Vf8SdD`wvx}H83+Sbldll5`z`o|LT
zX@(YBcW-aayAFvTjgBXWDOlZZdj8l>i+{QSPZURq5>v2%t#HPKg_G45d)|B|k4ZuO
zCeL{13-Cq(>`b~HvT6NWPlD>;?75lmW4W10xHNn#$r2zP-_Uk?{)-v?U3+oRyWFD1
z3*P4k3&lSU-hPTkLp;0b{h#Gfda7j$KfX2n^zU^2PX8=I?M|jjPYOcTWL9R;<IbTB
zLM*xNS1+{QiJPjkyy)oWl!2>BK^h9=GQ$gQcXNpveve=B|HtqOzC?t4a4Q^!6*;8u
za^8$wo!+e*Pt8IT7{u<bh2{1@c-fts_a|?t#BJd<g-U1HeHfT*e89lG$-IYp);W$u
z@tO-=Kh2BKv>DyS1JQ3fJZ-<d_O0`WKDqwcPT{=U;wqi}j&icTZ(`k;K1NVTXlFlJ
z{d9gLetW#fRgSbFc_=RM!KFBJFu7L6(?Y++4jaX5P}Wj8J&PrEdOWZc+%y@jQK4H%
z;l4kYszfZHAmVq^422om|6Jl&>t_mSw4oi_0vZS@)`I<&vl|_n=BB7BAAAnS+*a0=
z^y+>@%LoIW{#n%IXV^}1vLKokrNv#&<B(Twdmc?2j69BWN;emzc{pSpQhm{x@6G4L
zp9qkz7$N)l-_aMTxpUFuh;FV!s32FPHDoGzO*XFUqXBcZwnQI3E@Tn$R1_aqc0L%Q
zO*9%2$%bMTe3FTf<c|)kx_>Ywuo4ug-{sEHHVVwFx!J6mWHhQ_)~wJ2b=>$cmm9WE
z#vKksB}X#B@(#W!cNEm%F&0~ljg4uvNfMOI6g@VF9>`;C4pC}<-yBTrb1^m~kx|>#
zX4VC<8t_SII~Zh@CD*8f^bCs}R9vsOw<z3B6$S)Rd=_ZXA%$Z=rR?a!r`hSDJlp${
zj!^tkX`U_#TthOvf9-Tp)F$e@p7fiM*%N!ox?cLPdINcw25nq;c4D7}(9(pxKRv<P
z-gI*^`N6DKhit#tHe4_~wIa`HIjzy+Lz9$JXC<#&YfcArbS%+pXEh&=i}bMLdauww
zzELEeZ$sR~CRA=%KWTFI43$|rv1B?Agg<=bb9Park&JGKcR#&Jj7HLSe*Ul>kJF`b
z^L}^txZ@6m35Nx6Q7ocJUH!x}poR=IVl&yHu1rJ$v)gY0TH3ia*Fhk7q@<+OTDw(M
zO_b#>^?I)*p%_80$U5X?E@>nmwv4g?<pQeloA&gAw;sd|0Remr^3!E?rt{MLzSnvD
zhPf8y3<4O3`?tZ}!Za4d=k^ACO956ach`r=Q`E*vf!CXnokaopU;srrmA*rXUID2&
zbYH%-fhBA2ZLixq8}nUtX(Jy0Mb<qiD1yc&Zqm5kKWG<7ZtPs5Q$s7Y9BCqdWCyK^
z05B`6d2FAOmS}doT3iu6S*Mp>B4Ag$GSOrRv3xRD6BwD_;VpAPfJ2}(k5y6oNoIyY
zyAC}Ov#i_Pc4x9DmtWt0gCFSxvJOEhv|3wA1lN4j)SI|sDrCsjmS)6LiRC`jm)Z)B
z^vz|`1kS%h-^9!ty3vj|o=!`k@^whHt^6$BVJ7<c;HFM-d3*`7H&gmOnAK1~X5P!-
zUmWQ`d?mwHoS!X=?as?8Wnzp>*zMExIqaa0_%WQ#94No}E<mPk3b2av5xGM$6bzhZ
z-*yqx+-}AXtu^;y+89g@b=m6o>|7$>xMmUe`J9zKS)q<K5c5So(S3U%J|O-08H*ur
zw41MU;c#kY7H(Gsx;0J|dqsCcsZpu$<74@t(U?6>pGl$@F3Twa_xsj9w%vv6@q8RR
z-pfakhOD&0+-moOClW>eTSk5`g7uiWx<l!S@BV&0YV!=hWOj4ajaQzBjAP6uH?85B
zj57yCMf5%y1oO2+y+D={jY^4=`?TSM`OM;TVB0ON`6>h{aH!!fkgs}8C7rq}6t$g+
z0#fAEVN$|_lTqnLmjC{Z!l2>qXcd{FF=s5;E=5A~^-T6Am%v2F+C0O0!H?OW3O8?G
z;CSn!?F>g|7A%z;Y21aeIT$tyC}s%gO;xH^P{?_k!IinAVM(I%imcZ(HpMODmf3<*
zB<MS=ir4Cu;E*Y3q#NnZ_LIyDD8b=)hN-^BJbI6<N~(_#13!P<h)~jIS(^9+exQ6Z
zhedYmh+>Xf5Z=xv40~Vz_;~ujKyt01y?9P&(Sv?5s!8s{F(A9uFI`Aqa0J$o-Kj-1
zks<t&H+H>8>^qETvhfV+cC@R@_2drsNBvT!N^Xh$l@H}46anYR`0l>LCH8RHfxf<c
zM&7x9KR$BUfM2?+_d*qjKiPkT_*)YzP802tKC?b4U~$`0GK(;fgCG9swONf@{H}c1
z(+(-5VF#l>(5|fqkfG7UztEW`l%TZclhJKpN8@c9hf5lvPW#89V$}&cdPc@LEtVSy
zcbTEs75b$Bab4Kj3KU;+7AT^S)q}CAQlD~`5c8t(C?B-R;GE8t3KSCXN=iW~6BvLj
zXO_<pt)Yq<k}jW{Hb{e}8jQLujx=i%@L06eV3{UNZGf>j=O4EOJ{!%Xr{kaLG=J8;
z@6EtYE#cZ#3uSG;iWcL&du57#C*(<cwK3RpQj=NpN$Rld!I4itQMu{^ACdp@tXT@1
zH?4kN=;#MmORxJYpR?638L-~7Qq2<=!4X3>5FLNfd7%=qIq1PVk&dk5Q`h)5qDOaq
zt3+3a2DvuH#sQ0=(3Ax#s1Mu6*Cf#AXkz#^^11Cv32p(Dd&Cr4jn7rSB$i(9mF@CE
zCkxr$M7}aGgK{#Yr%2}$N;FLN&`;pqV^@palWuu1&cG3E!|nM))norxcO-;&P}>qa
zL5xx500NuhLeIRBgQ3jAJGzF6QQ&1j^xjvXlgU()J4y8ms1AzXWCUhyeJf^bv3!YY
z1<sY(paNBAV31Ge^1FM3BP#u`sVe8pT386PfhT)~+gD@uJIwmIdo_=B)oz~n%a)DB
zZ~7_t3tLHMDiJ9?K0z*Gzq0!B)mZXW0kH2cVpaCuKVPlB*meT3L}|?imWZb}hnYDF
z`QXDDzCnuiTLB|QLGr&o&pTL5_mvSYvwez6FDeBBD1Z+PU0}lQ*H04}4bzs1?L56)
z7~=WkHb;!}8eqDj4?{QCI_9g7kVRKwald_a_`VTRqSx!R*7BBs*|@r-CW&OBGgX-A
zE`#ymI#f5WrzjusuuQ-9(<8_;EnQzv$3h8|^U*BrCAFZo^O_!?+a}eLvaG<jjH)HX
zTy_iN<F^a5>Zf1yKTeIsC4VDH&J{90hHzd^d0IUOL0j#nB7txLrimvb)%(z({=N>G
z!j=0xM=(@(p+3DD2ijPN)!`P~*474x;G~D>fI9RlLsSr3?n11kfMg$$vo;qXP_OL;
z9+PTHN~4YPav+CN^ZWT)yk7qd((dWA)dV_YM4F_05$7{*I_<u<4toO~I`aC*3)`QJ
zk~LPUO)arT$)JH*3jtTUFClqc^AGtZ_vRXq)dObADl^fTls@K@A}O<ojYhfph8F=_
z+${5gkd&$Yy!R*7t|&U)+#2>h5&EADTihc|N{<{t9h=@m+5AjP<vQ<seD1a)7~E3I
zTjGrFZsjsOVur^ZF2;r!SCY)^mKswstRGTvZ&qzsMe@BDD4lxR^@Gb2S50B!9XH#6
z4I5T_Phve~*zQG~A)|2}qv5k=J2Vs8yNqVHV8IEZKo6!`bK%oz_ZB>yUchx!N#rC@
zYxE86^mW_^CVKhn0)M8Rvr3;*{>$G-hoDI%QAxLS{`wtQ<C5|#+d4K-czAxg0G8^;
zK<`DwbGovRVR>xsa<WidZT}mgVkA&<NMwI_t=X`oVXJ$Vb*COxW`q~O^H3txek+y6
zJj?145_yata@tVr@bI*$9OV=D7N3n835s&)(0rNQ+eG-0;jz32+ej&Zf<^pvuy~E}
zK@2={d_FAOo<S%nQk|qED+%qdGw1PKx&^=5Nmp9DW*lpcD?dbw6r$j6@fVFX(a3s3
z;g22>(U!X@F^{qH#^QA2J5Gtw<A9*C@+}VLs6Ca!3jc(d2DdkJv3yJJM4Y*_`#!)E
zXzuJYgUz?lHrI3ml2C`OU9E*2tn|5|)f(h}gCDbY<#<PQt^q<#9Mu(I(^th4i9`@y
zw&WwfFezPwqLbs>&DS)x6GnjC#>0gg9UuLv27d{XVTWb@aP#TJ?UmV@%W)Eq^l68M
z@#uC`e6dn>-srB7#m<Ssle`FXn{f=orF?@9@5H_9`q4L<ibh4-FFfWK&bh<)n({s|
zFI9#ToVhRBW<#d9pw&9ZJ??GlxrOf4bJ8bga@W_<v6GpGeF9v&g=MEVQI5Gsoq?i|
zN|Enm{!@IyzmKacI5=#e?a|Th_7}>-+0ru0irlYYaWP<W6QXJS?AY8THK;L(pcSf_
z?tO{=4CeaUnuMx{@B#K%zxUo4KB}Mr(oChXCLKMo&ZG<FgSeKbhJ3+dRK|0^%N3&y
zLL=VKlS|81fi&M4hhZtLZoFRK=G{(z2Iy6Hdn{GgDw)X@2Rt&$`Apd(_r5kmdEtX$
zMdn-2UH!(dR!eC+#O{Lk)lfeRx#92I=K_uPIkAUrIlI#pGfB$<y`urG<~?St9`jL)
zn)kkrPid>U<t3eQ#%J$biW;sZY7^HUc%4#Ft(`d_e3Lg92O6xq78I}n-c!D~nnb?V
zz=}&b-8?9uSX`Og7tFn{tK_TuGhF|o#QtG4p;JWL5HvM651prc2XVZTpE{hjBfr{W
z831gCmn<!r>KE%z1f33Lk}+O5^e2#;@v9`4tgm-T^j|c6Xc=k2OP#o0glc?vP3&&K
z44o?>ZcL1&I;qWHV#;(^pWc6xsINLpnV7EG*e~MaK~`V6tRHUfEk|CAs=wQF&AP*@
zzX$@*=No*bDN3Qn**8f9Qv+#)Z;#9)!rMz1K4-!%KSo3e+y6k;jKcbTZk4r1mXy5M
zpGv<stO}cJuq8SC>A3XNv~n|Wt$eL)bXg>t#wfCupMrvifvxHtqf&|a91R7FWt@AC
zc{o$}@M5Jgmiuvhq0&U<#C_H`0Z*$@jFHiGIgu{(@^34TkQd_LF+)y|ESG1WI-Cz?
zCboK{Vk$G*Ze1Q)#L%G(F{)HmDGHqgg{jCXi`<~I=w3o_eJJ&y;7Z9g+S{_S_8Liz
zZ;^Ya%L6pj4t-cD-7P|=AB4jXq?tRR_zy!T5Z~fAZz5BKvXQd!Odz&$rC=6~2hVWX
zNXPwVm#zHE?`1|EVHvBol^Xf9Kzptrha<9g*OB_8Lscq-=PrRQ{`1)CF2m1kwbf)Y
zlnuin%PF7b!#;di$};JB#*?ew7m1&6Zbze&+BAV;+#xD;Fmkgr07To5XIiUrOifr5
zQ2lW_GPkpjdB=~^w=0J+J){xaN~9GaE;Y5}X@YXLDQYY=JLHSnssW-0fR2~e^ow;P
zqh1UGv~X79JV=*hP0nBwyEFs)@rjT8K8$A#JC+J217Y-wP2Pzn-ov%18!DK)=AF0T
zQ--bm$!!Mo4(He{7kn+P%_)I<MHTo#Hg#yij$!1>NkOVAgm#3NFt|%F{9rLQq|Be&
ztR-cS8Ogv1-HM{!`jC-}R=3aR$F(kX><CJYj!~O)1AhjaU4sk9ga3|ag0R2Ou}a1E
z1#t#O@;~rG6AqhiV6%@s*7$UyYcq3RzH7CDfd1-ktDHJ{fnoEbA`B!3Sy6CW9JN@5
z<j>@Z6g&{G=yyNNgtPdX1prW2`tgrA)I}edb=0^SXLBb`kRE*&Y9cF9UUyAcyRtOq
z*0-guge33)F6y4Pk;^W6tJi!ZPo_xqjVbT32X(7_Yn<8A(PHb^WSx{iy-{u5GmK~1
ziBNzOvR#)AW6-x%qSj9$!rZvtzMMdF8X(^K2Qg;-9P{K#k-&%9np+5I?O^S_$F0@w
z>>(duG+(1(5+8cn_*}ZwRK_m<&BbuJAfzP(cXM^RJgx)iw=%%{saNiD{UlkbU$vx=
zQI%P&Pf}Jni7WVt+e>NODLt_0^TvZ@dD>YW@XUdM0vBJ>%(=v#-4nKtA)(K<+0s5<
z5R`5vXJQCTsXyGko{Du{3Or@Dr#5NQNg>j<?E@^Uajt_7!0hcOYi-K9+gQ24kAqp?
zwgm=g40}zf=WTybLHX`CY#Dk^5=2OEseAzo^@F+7oigl%94P+6v!nv8#*Z0%Q*s@7
zRv_qoBP1GM+eHr$G+`^nhQx37g?1;dX|9`Aqp4jxvC<agH~`8f+HT%_uOy^k4jT25
z5l=f{pY>8aMF^X&1i$~r^MWSDR~oH3rc};uw?jAP{LjmNEN*;~|M)b+CgZeN9iP5<
z+Ug2(1#W^wOFg79G7_eqE<usYe~njoAS5smN+seS<1h+99)B8Ss~y6p#;xDEDtFwP
ztdj1P(yBqd$BgnbP8H?5JMXJvjpXBf!uF8@8{H^Yl3^{Ka7LJtTrcAn+9(pf6*rxu
zNTFADX2Z3}PPLi%u<iHvb_9@>x1oGGsk1iadvmq^cd%%UNf+HUUuqO)5U`m&>hfC7
zCV4OuK;gf7O95%6@3Q3w)$6`@F^OxEg5qlU$g#-So0VJXUhsABN6pDqRomK4b$kWb
zYpc0pW;EEH+(AedewNNyFlgJmuCOK3vFw>b=cdkG8+(FTRQsgdY%d(Ohof75Z-td8
zWYP^mYnGf!qxK^N$`pF~qT4Q<@dK|eHd<^aOQZwZyv1ZqJraG<H?OY!RyB_M6Ot(@
zzw+%~$%hAw#cCxB4eV7IW}~%_ITGs^U=`8S-+GttFy`-#5oc%%pDiCnyIAq^{08O(
zU6Aw?I=S7vBBTz$?s=tJEb>^4Igc|?cTRO{)`_iYlZE}C40Ib$#=r%!T9l~dB^)Lo
zTqfA?R9}#f9j6V7%ZJ97b+QCaTZ~-lmh+@@%jHFtf@wM{-W#Z?w#WlmE6avJJc9+g
z&<<r1{CBFse<QA+C8(<`M}%8?GC*4+>03LVudt33rYk1$PqMbRt@u5MJv5)$Ms^==
z45iKoNu@ycf1W_CYkMtLTO}3Y!bJNQo;v<4Ba;Y^fYfm!!3`GWNluUa@5pfwr-CT+
zcyBO-7IlY@y{I(EPhqGU1BrZv67kAEep!I}->}qQknp4!xzgmp_wO$;vCYa{cVOu_
z;GIclvR4BdvZBmmlsOw0LtS08o5qZ7gii_n1N$Av{AIgiXAf>`_xCcKLdA3Dfn|M8
z3>F=DuCmuv69)btjft+1_TY@O+xZnMKjXnN{SV6j>V>Q~+#;|gTX;+EB>kV1{+%s^
zjQxZDY=P<1i~peIm%6kP`@9JSbV}8U^78+}+oFt=aC?D<TP>T$|E<=O9AU=6vkBwn
zqyNBde<9<dj1<4#bID~>_#f|4Ab{#x7tlVzk5hl(&%YDon%M7Rl<*qSLjG?b;pTKy
z?oHAQ#N0nn|DS{`7xJ4}C9X#FNB`Jv|JAG$3f#<c;Dpci<X_MJ(fBpQ5mZ~%`y;=y
z{R?^ghops&cPQR1eWGmW|GXCzDwYLS_9%g^-LSO;tO)Z+zaK3K8$~%lA^B|%5Pkg|
zPQUdkFWK)Q$s<R^8Iy2D&RZcc<ehR4j`2XmFZp{_H(?<T#(HG>##%_nQCS{vx|TPo
z{L|9kOEai1S~NmG@8+3T_&@?iPV3m%>3u3tI6#tY9B-pv``s_V36D`Lzf?P9=a7%X
zYB_@hb7Z>1Rk_5lvO0g?;nWb0gdnk8Zz=N!oW{^B&ngY^KPxt!S#rBv5x(9CMH?=m
zVR-1FI8-TZFtqBO?B{fyyO7&`6e;={4{2#hIDysBCn7xDIiFxRShR#T1}=#sA|tcE
zeGAj@CwVFOyNgXsh>-VgMgUh}+cCiZY)2Ly?QLKgbzT9>oLa?#w<gqs#CKHWBtTgl
zXkFR=ZYxv`4!T^*kC8BH79im<8AUufb=bm|6nj8GFVRTvl<X-1s%2ylXtd9{6HOF(
z8fR05o(tF&a=2~|<jz5%QR_-P6~?(SL^IpdLsjbsgm*!r#7LAmhl?lVho6MkVd=4t
zxze0gMa6qf<;WQsBOE?{ICece(J>-pMgP6vNLhk>D;^Vp+FV1s*{}QYmnQ@&g|=#v
z945=^ap54hY63+F{#4ogsI;uS_xXNDoy7(&z-3DI{mpXV5H(+A-unTrK^v|;)qb^&
z?dvn9I<GGV>E#U_0er;{AqBhgXBmd`+uvg!F?PN_<JTy1A}8Um3Pp-|QTXY$=jO1P
zLsJ*djZ0KpgKz`q8}0K}<nc8E*5IJ9e#3s9&8&C{9Dm#xPE}4<exIYXM8Hww-h_rn
zuM#$#CM>o$%{(DxqhI63N24bsC}`E+8K|nG6Q<ZKj9Ow4Sz+8N9+GjOKo-cI{5pYA
z{{92f4jfu&d7TD>+bc$!qL;H@Yud)?1Y^8l9-LVkq|7_nxG01JQ7RtBB6AJi=`_m=
zs@1sp#d?t~Za;2y^;&(3n`I+g4L%IG-7i?rb(jk+cKFLX)2oa&O{dRu7hflqPUU<>
zlxkig;CFKZ&a}$WDHB(p(u^deb<Oagz!uvh0~<=&f3TW%di@{<W&7?v{^}?aXlorx
zf-M{NPA5l7^5)X)brIu$*h)3!%EpG2?$x0>??WKyU*^^YWP?w0ELv7Lqm+5^lm&a$
zVexf7J(M<+bzE?jO_I{C{^$O5t;pk=F#G9}N54?FDf`)i=Xci=Jk&XC*)G;>Hm5Vx
z;(CPuWw*S;&MO79^(e!e(TPXK1y64uON_(yI8NW*k<)o#d=VOGwU>Eaij9%NYqtq^
zyld$yiICgcyxJ^$H2t!tukOBc<Cnq6rcE)WF@Kc?S|qIBxF>D=$v@M>ep!Js&e-=v
zg0Y)Yt?<s*b36%aStI8%c`H=qX1M(_Kltq{zzob<L^%gf{$Xs2W!?!;%--0<#DQyD
z_lZLo$KLvz06RElZzeG&%7W=bo(0SN#5*ww2BOZUn8{*&<Lj-;<>WI-cV@EYlg+{r
zIweh@kmR@N;^p_f_lGP4X?z%w_s23^n1;GWxVMMx*?!7QD$&9t<3a7MvKTu{%Fj$Z
z?;|+ZX8IE{jp<Rhngef33?@=f+5wn8#3s(hY>oiM<XgN%j1uvYcHT5rL%}|vCOYG*
zXB6e(rl~KHUhOARfUT&pWkJZ23d?N-d#B?(&fWWw3@=`_a?4;=ZWP3Jr6Y+W{$>l^
z5}#>i9Cql6P4t*+P1;|G(So(BRU$wx&}kCu>C;TRkK0?2kj*>3^Z{^XUbj`|eMn-=
zbYfZ}^wt(<jFJt)l2X~NU)~a_Q+A$*VfV~_v4TlTN@o1DcsUl*$aA)PA&4>H@mhAT
z!*zX7suT>=0H{~9gYq?)a{{Y>mKwBkPn9nxq=<}(p;<4|x`LTcXZDv9rdr^zTgh_K
z2i(fL3~$x&ZFRb+@#}h~BE&6>M+ALh4St^6<EfOC4zBZj14v6P{@Q>oWxf~V$H!vG
zyYcNAs^Ft=W4}D*LpP?J^EKyX2H?Bk4@i^H_cRy}YT`|Y93gOnj$K_sbO_Kmhnu8D
zb&Kw%#Cx(uqS_0J@f4>~QNJ!%&z-OspA5$DPS-qaD8M~INUALmKtK)@Cgk!B1~aD>
zN_vms=6}~al;82nFj58FdmczSExRUIP2YjYA<ki808rCHV}YMYi(BA;1#6?uaHHd_
zXrU76lw$Scpl+O%2gjA+bY6|3vn1S=WkgFk$y3OTvH+9Pl3x@dCPjLi>=@Bslk_>4
zW~C+u{39X>0A1%1xfcVrT>~OX&!mI3DZnx~3YOo;eVra0XgH;0K|ky9$K`cD-SKY_
znFpn_uNj+D04|Kv(-J`fO?j@CO0mXKX>Q4eRi=EOW17T3G*``q{A%6}E?OmO@sc_b
zMI*6L?%+DqmJwlZ?aT-tH@m#|)u*vSt(gNO>2#U-1|FLu$^Fv{$pZt-T1L)tV2xmw
z@i<y#Vi{i#`}{{Y9;)sgODij&fyZ+b6Y-1Pz&M>})bt8g-=2|bzafUe#1W;60=fVt
zz$<L+-9>@M(VK@GwPv}%SDTOIlf7lobUo~c(rB3A2-BcH>!4};Nx$G3(S9%~X+Y{@
zcdZs&zwqRZoF|HUYLZ?}yPNyT@uxd7j-_|F`;5kUR%mA?Z|4#mccKZ@6Es_8tJMIY
z%%&*Nd@C|Tye~x#uOWX%<^Vv9pt7kTRb6Fc*G6Hc!YCWZv9m0Ky#~Xflsml`y|XSR
zfI9s1{R#_mfjZmIe@qzv9B99xQNwXXgK3^+vfRyEB|;HeReV(tm6-g1_UBBCK|`^f
z38F$k5F^t5*DDTiz;M;Oc<QfA2~w?L9k+Igll{8hv<*(L<M^5>vuMJ(G&jTLuD2%~
zizz`?IEkxDtY4bK1T~WHQ9Jxp4+&4ccniA(kh;RnNi=TxqYaP8W;y6Ih*)0qAkhN6
z$TA1r=qL@st%}K6r;n+uFIzK<?BPh`u2c~JN;EyG<1Bij-9p2S$W00Ey-8xCZ7e=E
zS=5#EkRzCHad;f8Xgfu0O#m(JlBUOZcaEMpsoUrgg-)k44^io8+_+}d<jP={2*O-|
zD2<K;C;NgNUTV)VUtTP%ytQHesy*@+zap-|?p7JiI(a#5xC`~5&by0H)8ZccEpTUU
z3JTuGxQ!EyLspo8JIB^*eEr*vRy5+d*X~ZoWPa%p&st^k$@UgQXTjx5C-L9<loLME
z#{uWJoRm4{0d;xZPl)5aN7>2r-tX<i_kB;iq->SX)C8!a@zb7U4Ha`@NXf0TGM@yS
z&k~ZnP&iIclwXd!PrJf!x7Sy`Q%GS03lqFD7&<K1s0X_o1>EHaaJo4e$7NYc4lge8
zpR~P&bFZf;=ddh;ula#nEP0c%l&n%OB0kg`b!{@%K5nfBCE>sFO$u?4i}UXGDa(xZ
z&J^BQd9ydetZjZR5nLgsSL;%Jj2r{O#HChHGXdAeRTGO?F#9Gld6MD=kqqH9R~j|j
z@m;`Gqx_>xe_4*e8`U$S<-X@_eu=2p$(;epLIPY`4zp^;%(rpfhPTt@Y<NG*C3k8V
zUG`T4?L#``ga|?h)gj&!{CF%zda&1Sj&P=4j_l{{gN}<TsDzA;&ngM`*~m2#x;|1i
zwwZ2Yc>Lsvpb{j^_8$jC2x^mAtWrc6c<h^?Ri;An4ri-7mUniv`8)QDX3J&E*<gdz
zfct<p8skm$8+=SN?bSG&fLt9z8p=AQ;Q>#(McHSBjq7}^LPZE8KN5kpiMoP^TW4VW
zW5NNGS7-eRa#9uG<^kMfedeLzI7}p3AQJ!g@}d2*NIv6DG5M@l;Ylp46B`5CS_d$U
z&4=t@XQ3X~mYyNMb-L%1ZCh{@jed-8f8(Be#y7$k8@Wc`y%Q05EV$L4@Z;V^%Y_w<
zf0MbNcqh77F^5^Vrdr-pRa0@(7IbsAquy8K70%9>l(asznqOUG0qu2w9rEoB$5lcm
zj)4a6GXjsEMRhEFQ==7dsigj%B*_n{v%a$dP3f60Jj6Js@qbxc5w#alNL7ZgrddWK
zn$EI%TW39rNuGZra)jLdJevXKYw5tr?Z$`6qg)j4;TttjsHC5e90IR5+9^!?<CdhK
zySlAzxSBbyk{A&Bb3-adp;D*e(lOwN=R(}!?yvxr$i_n_l2`I)EE4Ijp7kQyyZ9`6
z@BC_sGWaeo6PMG&==lRyk)))gTE`>vD-?!`jDcap8Li@UO=Nj>Qdw#n<TeX=u`S!^
z8_=;45ycHiUhncMgUFpY*(X29`2knKN|{mfM~{Pr^ag|<Hh-Ur;NDhIU26kVP<&S$
zk??xSy^hl3akV(JW(HTiVPhSd2sfOlNfs#c4mIl_u9d?3s=<jn`01iW);>KEs4tjF
z<rbZr)at2eW`$EBgGH8g*g;xK`2nO~kBW|FK@-$q7F9)q3B4n+*GzoQV#ujHBm>@_
zhY6f%h&4|lxKXuhCc7<b-rgfR_C^!+Kz)bQ<PT+I*sD8O_1I+4<dbWKQgS^rO-t*M
zx#GXAK!8Rns<kw)>-p|}!nW#s`vB&T!S#7}mxLb2>;^dd+)ITI7~HA@`RNTw@-eL5
zvE<^K230(c1`^Az#&Ny=r<nE|S1YTuOA#!C><w407B9sX_bcSNnjR>O9)s?a?NJ}3
zhw!#)iL3Q#)LYLU%Bwi_ZH<oi0!W5*H|L-j*v^L#?=f}}-_5$iXBV!EnH}Wv(ck5s
z1~tlj%H1*!km$jPVZg25<tp%$@&9#vQ><!64r6i_!SxSLRJZ<6M*LLSh`T@fHVVRk
z-wjM4bjiC@Z8I~>r8d@t<IOJsggHq2G|llh&t&{=X%thAQSja#rgi5nH2e3D0GSre
zfuvaX_}DSgDcr^4e6EBO`nVIJ%}RFrLQz1R;fEQ?l-l?@GL7t)n#E~Nd$Qwbqx8CH
zmseNg^M`F;0wto4;@;m_4Q@Nv`CYw+@@X*}OXZ5(Yb460H!cw<!9DDC2h=^bR3Bnx
z_qLR0TO(_K`Aoj^#a?mLgS&-#O$H(|Gk08BbN3%>A7YZ_F(>lzVJFSH^JTj%#v;!$
zYSnO(h`7)Xw+!Mo$xkN;xma~pWUMs6K{z`G%-ZC>^fy%Mk8$c&)!L(3)}rE2iJZ;B
zS$an_-m$7J3fSp_0o23pJu|EwHE`Yg*ze2@eD&>Usvd|@qG71ZH?)Lw?vCrr3{*2~
zUw+gk_%hBE2@Va~>3(uDu!1lFKLuno#~72d<N^DlRPxPdG1l5uGbaYjAI78OKjAat
zc2_>>{1&?$o_?Dnr<{$g{3N{O{%q?Zw}hBnIcEtP=eU_SKX5qjVpOAOR3jH>O&lZz
zn#f3>FY>tSb>q6MNdc30qSWgSg1*%muPSDA4G0z*73j-$-><*^sxZ>ic&Ki)@HF5|
zvA*LftkEc&eS=9Y)x)re6T{}{_HsY|f=|z%2+-|0d1xVp8P(`{fq8aAr}|L(Q=aiH
z`GiJ;gP!G%QFl{YQ9QonOr@db)v*ApLiZ|*5#navO`Q8SuqL#hJ0O-`uG_EB!T)l@
zm=$mIC-TG6;qvo`Lz$rz^W-0fbJc5MyAo|q-8p`H9`6UBDIaDgHdUT@9`;r>4NF5<
z4YhBM1K(vjYGFzy1qD|wsCbt=g3I23Eu{o0h15MG%#L9rq3V{BIg8<h*mgPg(rXHe
zk7w-q4TBmLc3DS(LpaIPt`nQY+$1aHx@ZQigbF~5ehCRan+E^5u*KmV56^?~SYsEI
z@vTgMbL&mxZ<%`aHU&`-W+Nrb5k2E;O#eIc^L1Vcco0P6B+ucuD?^fyX8+amjlEAe
zrBu#m@vVU22dgW(i#y4{U%Jyuny8A3_pzJNt(83WXd>VD#5=21CVbmUqpt5Ai?b7S
zuv%QfX|YP&vhBQJog`TK;ARQj9?wI@zX)j_#=Ya`iw7vl?Wj}6(rL4IvdL8lPq>Jz
z@{uE6xMc~wr2sPcxI379q1+3`+O$StH>ZO8iTIrRD)k^Ho!n?>$`o+=_3ni&uXU``
z^qsTpv5ZZ*>!az=O;F8w_{9ZmU7ZDvq|0&fRb?^r(b;CoBZwx8j}`4afBgnZctAO~
zSIyH^<Y}b3wKIFc=TmdRF%Z1lZ(Gv1UIbhHP;I*RB<|{Rq=R?R!T^jRyO|zx<57xw
zLYYUy9ZXFC@d}Vd_@W>vv@t!D$_V)UZp%3T_HiWtsv!lCsz5n?@WIk>>y@Y07sQbh
zC<@MaC1&7qFGiM8t_7#<oHB9aN>xhD+XMMw1|!aRx_|<3-g6w5VhKnFT-^#pL$}tP
zJ*6;h^<YUj-hdXnfbf_;lcLYk%Wr;q{mrN|ApS6vXR1sUTqzWS+e2C73FCjQ-JDKc
zO_|B>uG$=CIg}E<2Yw46NJLRGGvk~QlGd*HSkz)ZfUMGw`ynA|<Z}=j(6B>EzmYUg
zwBgg%%E@b7=;<a4%6BPVXW$2oT+aI+kS>UE1K}r_YPYt9@l4{H|9;J4v8!*#OtP1I
zs1v57ZcJ~$^{YFfK*WcNrQGT@;cTAJ&fIRd0tI1>W)~X0%R^jkr6cTJ;nz4UkdPCR
z_o)%Azogk`MYN{vxx1=L@y*@W*sNDIyYw^~2Sv}0MafxkWAGJCA}e%TDef-kML17~
zu%-;GIY1r6x#V#(7x!M>d#4JO4FgQsk1EkB)HB+ytOwRBi{w*VsK2aI>tvR(u*%IX
zp=0D<EE6kK3NM2S-=yUjDGOCjV?tbTMu=w0b6CswetP7m06T+b)D8#y`}vPe7V)xK
z5g(hwP7MX!f8<-Xp0Ha28L}5sZ{pk%%dK(K*qFPk!&DOEj&e;lY)W{--&CptjD(fI
zR{9Owj^@b+w`PtsIV0&pig0ht0;V=h-whisxoPc2WfN6^?P)$}YiDFRaHHr>f0B#G
zepX8pHaRpmv+NpZ2|DGgH!zlnDrR#$cXKx?=Cz!zbY`AC-*Rzdo;G#9z~pJRupIh&
zVKEV)SLelnktd+>s_5ln_@|s6dG69oc}Rt7z0Gtn_hx_;GRWQM>e#-{Y)1>1!l>B=
z4KI*VyJG*f<l&;P_*t#bkkUXp6oS4!BISEdT8M#Pc|0D-W7RVN!ydCJ3jcn%*hn;0
zYRsgh*dJdL8XHB-C*A5b>>6JXsd>SoU!Qe#a-Xf+Ia073_z+KR;|aZ)-jR+ZIyTt3
zbGwZBfrjHLXi}_rV0JLkcDOCrV&F(J<;*p*0P$W{75SfcK)xH7vxTC+JkAe9KX<h=
zkFW8Xxcf0=A79SpJVhQSL=6Ah5!y~dcy#Nl+u6nd)Tgygj{ebnMd@a)=<J*e_`<Z4
zdl9N;;UPCIm(vAY;k$>s3ME%eUx2NSOkm)KnolXnWx2S-r%_wiP(oOZTPn5l7yzR_
zZ*g_iuoCSKDt1n7Z_xQ#Y8T?&A0+j<D9eJ5x5TgfMr@C@b~|CkC$7Q8%=5}SiNQ0Y
zjX2?uXkcK5)wV)@&ctP^1B!FdX^C;vgYl8b_6^S3L-BHfLXN2nmUB#-E2q;>m5e^S
zPqTv4YUa>V3A8+jP-|sG0`S%h9Yn30YB+v45ukCfUUO=Ijp3+!tZ2|C;K5~NN6gn`
ztXrkIfh_D&v(adisFtu4FU5(WE9ZNmTUcYzPB;Lhe`;G>Xz9Zh=(9DP3&6KWQ_?Ea
z5j)rTCO*fde;w08363Tff@WYQ(}2Xg9IEr#d6XZ0`=)hBJdl3VE!Wip-%#8v26g?o
zL&jX6W#Uj3?!0M*II1dbS{-1t^>{dj^*-h)$7^-eXUR#@>|COB-VW||82$0=hOGLz
z3f+nIkq&#j$`Bi|&9ZWTp~cRn*Ud|w)1j<0`iq5j?nLcekmQSegSZ0;$06_G>rwYJ
zEqAvEiN-N~*JSVI^pVQG<Wa6|pYOlG_s?r$pY07>$*|g*(6PPhkhPBdtgd3O&eB`X
zvzL@RKZ}G|b?H%AjiPw~r{y+VQny-{TL=n3vIUag@Xg`TXAQlC(8PY?EA|aWz1?pH
zgJrsrSz46BEPH{j0&<N9GE0z+ed>P5;eN-*QQM`Gkbw!ZRi$(_2E&$9L7wmO%}&Of
z-b<8kAgp!6Cr`Jkt#DXQl0R&aG^~Tdz;0pfR__%n47}H#@;z^@mS@z@rtExIly%+{
zX@uN*AYWkjEzM4D)reIDE6!}#<;6)SevheuTMFy3pjEZt9(Bb$zxPR+mE7C6S{QA}
zfOz`l4nfN~<~(=9hhT5|2Y+p6Yu^(K-f*JE!AeZ7Gb(e+ju_Ik&x!$WDS~xD);p>o
zD+b?}#b*7h8r5pp{x?GxB{$~s5GGHD<jv0~LPdt59;eephb1+dOxmiAbOI-Fp)@<+
ze!#awypAf(>bSv7TVN+s{VR~l+QW-njjj2{S`qLZ|42vsFwe{@pT>aQlWqPM$*t6z
zQFpiGiqgHj4<~!Jy?;gJks8BIHPMIdJ&E~mk!qf%m5m7dZjS6Lwdt~m&;nMcVXf60
zRaq&AekT_6`ms#<NP%)H?KwTKi@zNoWyd#<k9!Q2(3~#5e^pX~OdIb#NtuyJc<JId
zWIsS17bpX`#MLzh`J%1lKZ49^1jwRLX3%`sF;UYnqmG8<xWE7xr*Pz`gxvaA?ep!b
z*agi=o;gE@)WcwY;5~cUjXN(w>R>weg=Qqn9p%d2$?cBKz7V<my&O@x*@2gdy6iTK
zN3Bq7(Qc#e8;}$D3OcS7Hy8p?C4P&$99OwVD&P^Nbev`_=dyTA70f39Y}G7qd&fTw
zman#f3hu6lU6(5*eH7X6sYBgc#~;&M@&4%&xnb3JZfFxw_eR9?K(PIbYmR$Wb>p(1
z@`ju)JlF{6Uk@@1XND~eMSpmGt;;4^7K?wO&Ug}Rf1&JH#}&14#okyyJ$BWSF;*&^
zd3SZ@>}N7J*La$LGqp8#N2I^k<R)b3VDKKE=SA9i0(IZp>TLrq5R)vA^!^pFq9%mM
z&6a;{`}r~4zST|PlrlpK)Xt7Tr#`<h=Gft`ywl5k<R^!`mne^4bPboB!?ylBHq(0H
zpM!vH1)B;`TzfPcG)(PEF?ICj08Ob}h^YB$fuLE{kAM^vU&9VKvV)o9miQ=LXk;(l
z(j00<FC=j3PQw}6Ic_|(cL0@d8_KwnPb>P-5}mL_YRTh<#yS0PrM>+U<w-ovI(0Zv
zyZ>CDYD4LaNuy83^K_m-#0&{|P$P^Ev8Nlo{APC|5PO8GQn^Py(VQYRQH#YmuLbT_
zQ}qJwykF^(Z`|tBe8)g~c{z}X9W|VmSz(B!nWNq9<mHt|^F8Sb`HMj#JqmL?-xRKQ
zE9cD6(7_UuHf*JNe@2tMT8#!{EIb~c!O=*h#Gn|t+^|&!ZD+fvHKFxgr3(RmqazF3
z;GL;R0Nh+IUk;zm@lt?@WT|#}wj*t1A-8?T$_@S(v7X`4v0S?CLbAYS<3mzBpivq`
zhiOn<id}6eWy*RNIFbK6AUTJ7mvqmcs&A|?jEzOO9@NyFL7_n-bIpFu0Y|**i>5{r
zh9RcymA)^k_kX-i8)<VqjXtscm;wpNe)H3LFw?d9yAN4p!xPio!O7GXy6LS!z2Lus
z%HZBr3wBX%HeI1d!S7medHr{J?>Kibc9%TK+mEkNY?5j$Zs1`v+Yqu&tv+?y=t7Dv
znbDt~!dieHjyBTEL2HqhkZxm-RljUCZ|Um6&Vcg|Gl`{5O+FF&7i1g(T3|El!cK8H
z`+2I|c0ZfOWo2*06Uz*;uVdvhC4$MRcY8kaH2MGh7l86}&7L;9bk^RJD)Sxsn~laY
zAsYJ;7k@#ct#Ii6K;YF|$`Qn9Eg&spF->cZHMF;$^CG&*RnuI^oh-`dR<d<i1C*N#
z72@py@>wWw@yZ*krqKcU%=lQni>oYpa5tpLO>vq05dpBC*9j&+UWmh0+~x!?);`s-
z1EIdDagAq08d^CL2K9~h0%pk^_7=5}kdKM1nn@+DZ0tBdHP4F!(~=5g&iVSAqTSLL
zGdN7A*%Fr9(qTA)$EV3qMjx-PCy7?D79rxIL4Nnoewh1x%H&s%>#mB~kYfdpc^nq9
zs!fG+KSmO&@OR9#`*;@ablxd3X;)~C$gR;v@>Zh2W@|%H_QgzP0*6NqpJ~$e9pBJU
zYF&@(%V^VX98>i(Iz>KRRBDJTJNsm6yL5-i+f_vLaCMec28+CR3JA%)?|kKa3p-47
zu06fuxtCziV9K^@J7x1CGWU77SJVm}FTB#3`TO4l7C`Ux%c)>SR&0dWPC%rJGAeu0
z=CZN<JxIvb(m_q~qw>9Pf|lV+EPF3nQ>fo04ZZ?sucIj9G0nVjc9$CJ<G!G=HPPSH
zPsPBkCR^qo54R$9OkD6jR%ON1pq=)1o&ZyyWQbg!5*e8=qWE7P>=6&$<_+N6`u?Eo
z*&gg)Bd+E@C_x^Fz%2$!GmXHnV?*Y5m!ZjKS4>yOg#FVNt~RqdPe_FQJ}RYmnDql@
z9IxWwq2=dtMrCG$+vXg=c>|eEb*SEqEQ193(Vi?(@HfUcPvxr`&H;=XVZzsDFP@Q7
zPmr5fuQoon>b@ZxPv)>>M$$G`jfSgIOA1s?S;O&MdB#wJA}p49U`4u13%EWX*JA<v
z4lsZIsBQ#eDmM*zi9PTH#}BS6<Y^&^iEXURrRzD8_C7-jr->QW`+;&nC)6|*D=}>~
z8cq^j>oYtpt6UQ1;gPXE&<QsstoNk}6AJ~I!L~RGm2@QQ5<p(URi2RMlA(^=jzK)q
zhA^-zA8yZ730N&h2VBlhhbFzr99|g2*Ocrp6lUd18GWn+vLpyWCF0{ou3MKKpYG?d
z93CI1fm$<G2C=UCEE%8dobGU_g#?!66v>P@Ot#BF;L(KFuk~uka{Yk~Ta7?>zp|UU
zsCj3h{wa6!W!1Yn|A4itFsPI-7QKx@S@g#2tGT4bgS7^T$6o<AD@({LbFifgl-x(~
z;6P2};adIcB_V<DQ#YL&Tn?5YiKxqaJp1*!p>w*1>xEiKA5|vB={ia;?dP6e+o!z3
znky=N95W_!L8|O>dcb<I=sASM*<qB={K|d9;QY*P#8C*8+cK?IO5SidV$c_`teVN&
zDJI98qPu-}lTSOS1#v9BX@~jO+uH`>J3ajs-*F&`@TGTQ$Kee#{H8eN^Gs%7T1lUy
z$fcp+1Hq0n?VB(FOAc(&*}l@Cl)^gq;tagqf3SF22(rN?vK?xKt%*ggo?GLYpWpSC
z+v-zgyUfq^sxEL_-`!4ciK5P)jP*Hxs6K*g7UM2<O#yqBOb$dcp2*(6K!u-HXyi5*
zxf{{7@K{#3Gw>};!60&Kt`X}(VVeYb;r%<*m+|DUUPN?NPYoocf4qE5kCWR|*A)@o
zZ_to9%`)%OS%C6v2*+xoq#?T6qD`@2=QDQx+-nAX22Ri`9HWn)<62xIugB}KIgazw
zRh1#~QPi$NFcZ6jiL}rYCX<NNfQ-Si!P`UanxFMcJg#K_kEyc&ieuZ_b|3=`Ay^;~
zf<tgi(BK{%g1ZIx;5vA43-0dj?!n#N-CYO!I_I8y|G$cYf+?oEr}y5y_FB*TuF5jF
zO6!-mJ;{UfGp>4gxRAutw%<N7e~TMGDPYS*n<kgrRREMGGKS9u#qB+gv%i}gBbiy-
z-dm8|Yp?u#(a2R8bzMDt=VQs%PrTu*{mJHnpXaTPdvoBbM`o|LRe~9_ByaP~)an{j
zEsN^p1Wyl3YGNvkw#>d5mjHppthDPcTj|QPaDXZ%jrc9GDo&wBN!)#R;Q581(cDba
z>Id9^&IK2U-YjitKBEDE)D}4!F0SDE?d*@6n-TD!oz3fS9+sl*XoQu;3&Z7~vB*ip
zmy{!X{r$&l%#84DreekYe@QbATMRukHfC{Y8n)Tzlv<iu>a92`lmfON_%)77%DYL6
z@wfOfhg?SLBF8Dy)Au{9KRRO5?Dn~+1mUeNuA&JU#M87quB##RHHvDtzy9$*sb}-T
ze8Z|#D`0T2_yX7Hb`A?+vCRGvNteXX!g%z0Aejv5c&RpFHvOr;MOD}C?_dk#)7J+%
zyFTP^w{%*qira7Ydh!#QfKI3?NJs#3E1A-E!bL1l$@voQ`}YwMi}x~tG*U^sI=C#(
z*_Uf%rzhY0LUpt@&I;d6;V||E4`03Qz7Y;rl?+DkbfAz)y81c&cX&(lwPCsCZ(dzr
zXQhiz@7p<;ttIN7x=AXUO=TeAZ97~K2%`e<BjBF^IB1}K0p#Z<ah@tq)kVb*vH{>W
zsaXM^Wh<QzvXy8NcbFvcO!|F%t?u{zvuxO!jds#4Yv&gi)|9#1U55NAw6FOo{u$S3
z;Ou~iTEg4GvX(p{yTA1E{oXCr9iT#p`Ilz7E7^Xp)~r)Hz@U`L9D`aYkU`95eEmky
z4grLf1)w7n!%4b!kA3_#9_O9xHCkpl11!d~BXrG{htkxljd+R$TK<3%7SBlRBl_+3
zoSOUppb@JI)7b(FVd3Qr`=U76D6HeT#P`w?*u!-p=$wDg?Qbrx6=YuGcETwga%4?G
z)IqSld$MdCw8j4Lt}K(!i?8wLI;O{HkbXEZep@GW2&g{k2bes)>zhGd%J=$bGB`zp
z2>7Q?C|r@#V=Xu)Q#jGDj_=0p_Sy-MykxW5$k8V_YMe4jAuq#5NAO!>ueF_0EGvv>
z1fYR8%lVqUC)F0090T#={;96kUsJdt-f!*@$|clY4#sa)vDz+0p%I($@lDK*Gi6tU
z;o9;$L#oDCalCRB8#z}6dvEKWR$T>Sem%~2lu^kp@9tw$0?Ot>=_)1sy(UDxy{>c8
zSl0hJc-)fd1Vn_Q6AR7CsC%2thb#X;?CKKwou*A66llPvk*b{{r*t&zXt{uj&>K$W
zHTMC(iiBx<a94&x8gJv&2<MJd3x4uFuJ;1h>;gycDkYO*5B=YgK9>M26|;z%wywh}
z-c;3UmFdVJu-{L=exaKcp0a9}5En}0bPbBFxUQ3I2vR7rBsE=apnyQf7sdDBv8bd&
zlj<@Q2cL5)w`mG$4`)luA1P=_TyTPoUIe@pT7M|IWLjXWwQgArM3N;PNI)@&mm6Gp
zsrR(w9ggQD&E`6nOKlmb)rvo{nBIVf<2h8XX>99dQojyt2NwXExB;8xtX12q{s7(B
zFM0_7qF77ep0z7Di=pcopLl1oOWeLm>u*^M#M0s3e=|t`jPjk_8vzkS0Pp2``-6&v
zB$@H-GL}??-hIWA`U_p>yl78YtvIeT)VW4sBIY087B3NTzL{>(iY*|T0VGk=_gy6m
z$==k8^8ULc$s}!f?E8#Ou7iY^?{WqTAO8|e7WTC&*pw>qT{REz2qh|wKT~s(<Z0d7
zo;OGnZ!YVo8SXCNpf*R~kGz(c2#o=m$qg6zk0$c1Ia(=6V}3O>1pp6lq!ul^Ez!2a
z{QCiV-o&sssw%Ho8({HYX!NHCED28tVUg%~R&CIGblQvC@mU5`8NDFifSG`Dh%soZ
zDTT|d)xF_<K3IP<h$qI~a9ic(_g^@&y#+CQ56>j9z5eWUe#*CGK(TN(_oM}3ta$%h
z^@-$>C0zlaGLGfls(dz^F`rj#RY_d5KakEDRMIK3Guu9CalCa<%;mLQW!31iTxP8O
z?Rb)(SzeA7)ZnVDyy-k@vER_~M`6_lMRODn{{p4$%e3XLKgyA!1;lOX>s7(_K{=pd
z0_J9f17g6d@d2T-Lo*q{8B5lgyO_2?z*A~n=R1xwbPD+)=qtRJzW@;jM`ES^aAs=D
zU8e2f?p4NH*pz<~F0bE-$_8IGFi}i5?=@8A73ex1pI6(g$NEfCgcmgP8a)eWF3!mF
zMv;dYC?Bj-zg!h;+J*Q8Z4WC)n9iDIUR=4E*spc^*SiJtrQILiPF2b4v5cxE4tnfx
z7;Jfd*my%<pf=oSii;J*fb$0QuMTJ_+EY;|SaH;$wBYUh9j8$ZY~&lzdkoufAAydX
zMJcNTJvLhBnUij{H1^9|hRq+>wzR9mLvdENI`r*4f2ULSS1-&OQHiZ@VvMK_0^O#~
zpOjc!)?@1SVs>38!b)%p_%~y@v>Ol*-qH-w^RnmLOsiFUjH0;c^(jqTF78~L|3=9q
z5tbP1Mlv$F^kbo3okqo<>umdp?(*EtmcIk(Fkc;wVEZ;PE{Kq?@!deNI<D9Izueo2
z7@v?I7){W;%V?OXD^ONOsK!Zuzis@)+2X_WrVw8$i~I2AR>I_H#qoP}y4kQn3$sn|
z-$_Nl>g5_uf@SiQJAM~sp%E?A9=lzvZ&Jihn;S=$I*Q)dOND*ZGpr`xa1pb=xBmKS
zc~*}O6N@fhaKnbq<Ti{h)@|@`;DMsvQM+87X6}RzYE&EaN~=xQHqutC+A2n}jQfv(
z;MbQ=iiL7Mnk&u5vp2)BeEPL5>;D`cID;iG&*`9DC+3~D&KbyL8c*+V1fa*@<4YAh
ztTKl1Y)?g6U1y5!vCDXMY+(K!UF{67xi7Y9bRXKLNqb1fD}!Tbhs^{DH;luY_5G>f
zD#=`y?x;)~irD<#ru#fNCW&jV#&{a_h7(j56PCE%xy~y!_Wzb}bu=mTP6P}$CV;HB
z-IrRTGts|ZC1;IE=;2#SU#S2r*_2f0(WLGT22R`cXp4IXUBhf?N=|wZGJuxounWO@
zVG<L;=-eJ@39{QlFYkr$aAD`shH8JzCsK@-Tc`%T#iIBJf#CeRC!iA6Y&sq}J^S8O
z6*gv3dUg|FtxzTX+5lgx&T#&9u<^d@DE%LUB{zZxNJ7&8++zTPjp?Up^W`f1234WO
z*flVSfD9&KvP`(reIE$zumF<(`bIYF{Vx1p2H1v|`1mMysS&5JtE%30^yv>+X{Y$a
zXNQodJ{$;5T*fTN2>#2oGQz0K>W&k$8ck<*k;~)rDfAk6CyR)*Ka%vhW7eK5H%{H$
z&o=y%|Kt-#`^gzxT@@UAogq(+?2+Rkp7Lh*U%JB!fhe8MsS$~tHMVYoT}fG`-;uts
z<hlX@mP(|(g0GglZ4+BauJ`%A&cgp6{~4!vkld%axj)UXu8{v#W)l&Cgg)V7aTEm?
zlk0(v7u^C(r4ZB|$#l4~NNP(?J&976uPt>oh$3ddPAJ3Z5i_Otzco&K0?-yP(V?Ov
zp;3Pq4PgGk!TPaqlnQffgKYV=S}P@P-4)8ednTT`9PJS&K3_Uod%NWNHGSFJX8YQ%
z_em;&E0x3HSXi-Ww&E=(*CQ+bTwQQ1!*lP>!ph4Y(#1v$&yX1OZuOxosj8gN-;*oL
zkI!Lig$~O^Q1s9U=LZLhfd1d3e)e(&5vR!Ym0|eWiC6SE|6PcQq|nQQ&^9Y;(!-EC
zjutFx&bmwDqVZJeFQ(T|qvGP&@Od5L84U&`ht+DcsDVH!-_d`f8;Pn3+6|y+8ll@y
zY}(=j+uzS44faOx_4<baY_LE-!3OXtkrq#*$KPgHlbJT1%7715pTO4RNx$43$+wLz
z`W{HH-OQ&fg+7**l@(?8Ts<Y4DqQqXtNID|VaCQbfn5LP@zBluZ)Iyu_uZK&cSjEa
zIsE_bLqVJ;7WRUgQNX*R@3A%y&XfHfHQZ2??72DD0jSGfyOzE8!u7|=L#yyiX_=c0
ztG16>7l0LwTuCD`l}Cqwo$(97LXBRq!RKMMnygEsQA&w&@N^VK*m!K{OTh(@{+0t^
zVdIWwUfSzmECw-yLFG(9u{LpSrc8H#{gIWl4X?o|C;aVH?Pk<p-<9BqGPx407)r%h
zK%~!Cq)b~|EoQtcEd+WxZJDK=POLSTc&+_Gyd~8otOxR#N~T@9yL(EZ5>|0Z1S%$(
zN1KG=%#Jo+mE4xt6K;hV1Nw|te|O}j-l1eS-rxV@H}?uOK@KDM*=*eW6vYhhkVDPf
zO!q>k3!tyF<O~KTPure^)Py9$|5oGJtAhSUaZ`w0kq<o&Y2Vj9GY7~T<?B|e&Bs@-
zHnSNNokv?oBWZn9$9O$UI?$t8%vcxd-B}>eHb+XJFvF}fhK4mSTWz<_rPwBjZQW2R
z^;hNB3(W#71?F0s%Q=pQNVJ5iRJvB3PW7<PL-%G%k_LWgmFe2@++y49Z#XYAk1xKL
z!1{ilPHk#3BE%-pErb>zgJw2<l%I4rfHy5d@K00+_Hy;r(L?P-wfGN^1Bf=zetz;q
zhRLKGcPa8W!c$+w>Fp=w5s#rSldiH|B!_SeI_#A3s`yr_SY7T6%VdeP@;^1!Wbzt5
zN?LH(Wi=uvsvYbOY6C^oyIATprbFdI#XRB|dUda7^_u8Xkap(BngjKNSUs~VFG!Qc
z4wb~Z2w}5yW%PESp2%K;*0IT9uKfTb9o7Yoe48>P9Os%mhKf)K-|5*_ZgSnnwZE4F
zBhWyDq9T#^cH;A(%)<z`9eVBgyK)a!e8pIf{`Zg-7akEKmpkXLFMo{iR&gdcUhd}7
zX{|wAMA;Y!Z)*Ndxxe903b>xc6MwqJ(L>tw!YyGaxx4(UcAEp4mgt5Y9ZX+sMNv&Q
zd)tdRF<YrTS*l3MBtZ0;Jj{e1{JaU#jy6!!=pZ{@sfZD_cYb$!1`SP=A6arXK0Yug
zq|FEiwq2B;wm6>dfl9t&&(Fs`Vrtn+a{;N8SP@@b+x#m1e$xW^{GaHB8Z~~~BBeM~
zJg`t4yQ^dl)7=c%d3NeRUYRtJS@ENLyC;O@jmKJ0$132SB}WS5U%H(1we#wmP`vcS
zQ}J<Bis}6wc>&$Wzo-oG#W#WYL0b~gsM>!2Qn98QH6`|ZKY=}h>(w=&m@jFjL|>5_
zcH4E#DW6Mg2jI5`Ej5l=STt2aK-u#kMyEyM_ix8N_)*Bsu8wx3QYDgO6qZH4K~k7P
zqXrtBc5A#baSD~KVdF<P)$1%?dMz#y`#JHHDFr~_DE7I6yQx;aF~WH^p46gay)%p}
z4~jE0T->XKiuA;VYtWdxSyCgj?6~Bz!?7cmQdYN9*>#e%$bnnd5Z0jmzuz|=!wM2`
z63q78fTA0j!79#6_SG-e6M^=O2rTrc?d!=C#-1q_6fNnu0vz_smDM~8iQARqdvQV3
zZ>^-b_|<RxbL>CWyQ7KLfXv~lHT>KVnJG5sI6OF<TbGU(T2)nJlj=;ZNV9D#y6=3#
zTeHpZx}l-U2!(qyjJylUZ+?yemr)`xl@>QLA-1rqt9<5zaFb7qzL_UOuo*CKU+_~$
z7DcF5N!h-hr7Q^&^g0gMkN8S)<4CBeOvL71T@Ugz_CkjWFjyfQL=_<OG%56f3k`9`
z(?h+>nfkJcmHEq}!FSYgS}D`x_bxQ{!(wTFlJjouRevmS6lGmrE8UjVLGhq-&C>>f
zCWpmgBeUwZFO_AZx@lJQ5|Zjh_I9l+3uzQA$*b-|(66l(ha7W_ynnSmFRs4m-hh@Z
zf-Z_e>VuZ|<E2wkTA8!<#XoX6QkXxQ>cQxnZ;~O1)3X%Xdjwp8+fMTvZ3VOpFU+P_
zPVe}aYkK9cW)SoM-`8-u{+GfiydV4;)lO6gGnXbTWp^>Ur%|X3Q8m`b)PqEiNC@BS
zw4T@n98FN@S);j}09vo19x})%|1QA1djc-j;f52vd8R7h>YJ3hEU<Sl0Rq+mlIMdn
z)Tssow{9oeCP&K}tAn$z5a?C&k|I)M--ZmbTVRjd{c92UQT{5U=O6OgpxP;>7g4xC
zEFQ~FnNOG1WZW+oKV5+9?AM50fZ9EVPi+LE6w+F_&G97d#1YIGsiewm;>2*FqB{5F
zq_|rStGATx_g6fRJ6FbVi9q%kZFzSfK*2Y~uEG4ewP8q=XT)mTV8?KDP=j0}1%I(_
z(mrLISNxfgmA$P>-y?M7fcRw`LsWQBd%G_oDXuoa<77GuAqd@*?||fNBMPpcp-A!T
z;PaX#oXODCWWPHxAg7U=+_5O2R*&4ey}ujxp>`Te)eL-imo(=2iTX@=Rmuo^(BcZf
zz9jNp3K<Al3`t5h8!`s5MrE#N8EpU|iLIo6%VYH)GaTp+<$HT)KsF^t?Knq?o}k%y
zyJ-+PFb>E*B!!OeibS=iO=p7T#b^sXhEuU9v>AEs-5BW}A7mC9EV7VBYoEOhpBW9^
zOfa8x?Za85RV!?e7b+kze=eI6srZ|Pw)z&veQ1=Ghqq5}>_)Vk*BI;{4`o&(^NipR
z1_ab#!}}xUE_a8@tw(w6bO>uKSAV%&yDBv}jK0|V8H`lhk;u0G-3kKRUOAX<g<cdM
zpa3@XyNl**VTN!l8!@d=bQK_fzHvVwD{OF(llwW8Q>FnS6^fb!7Sq%R91TPFZ~m?9
zat*`&zx>92T^j8JX$*_l(@3ZqUlL~wpNaFuwlV{H*R*D4LU2Hw=vJf+AkYd6f6r}f
zdGp}}>H8)QOEbmRTw)%>oayh_N;`4B)h3E#efR1uYnl~GDT@ZN9$U*T+}-c*6&vh1
ze8zhyt(U?F6yJxmhFs#%g_vMmByT>hrQPk0I^_a$)VZ{HH0s=~Kkt6NX6MH!H=;@#
zKX2E0%r?6`<e_ct?Cqq-eb~+MJbGTSNSc>Ig*dX-rZsx^QfNk;wuel~>-%+A!Hp?l
zcz{+s1i@YyW%I~<(B5dhJB~hBtKspQs<YQhY`9`fX?5zomfkcu2f}$gw>)yBJweO?
z7!T75#a#C+EIiFymIX7LL%W&oXq=ZqhBUzPEuoNPaOBbIsE+w2tIl{5I!$d_Mr%!a
zNi``@_`QM}pS${{qJFAKnO?r@cu~4cxa)gQNJ6B>NwqF4+%q0?q1}8s$ds&9<yw(E
zKr_B>o;e^iw1S<L5TsaGnkfZ18%wl^j*ZrGJ!E~8$+k{w9v*%EXp6DJ2J&(1h+?q#
z#^_Mo8+piYp;GK{v=9f+tp~bk)V}v(o%BeMydX8>Sq%j5+NX#2>{|_Nombn9yA5=2
zj5qsLmpVNkQMp*%=>W33m|qv}WV!YU=G_}fBcv%%X`PX})wmbztvu23cd^!em8y%Z
zWm$lu#XgY78o*y}P2nN9xnOdMYrQwEhF0i*o!=j?2#k6s$AGcb9jJBcGQ}xKiLc&3
zX0cN4mwG(gFSk=2rJ$`706N43vBwfVm4Dn;qcxM&<!bU{QCk?eJnk6vtV!WIRWhro
z@hC9jW2)_Guxrp=pRovav5_`w_)W3Pws2^zHkzZp{-{Krm{tzsk)gxIwvf~b<w7Lf
zOo-k^p{hZz7oj4_?k<sNMH2;-iZvO3o$-b%c))ACHWNEw4_Qnkc|bDKXuX+8ZMj&%
ziR|P~`2w>dnY98@WcynjYlnlix}lN8;R=1Jmq`vTua0hJgJR`k^K$>_cOAp8;8O++
z^0Y(#Ly#`_Bh}u1gN&G!vsQxlx$fWO=U7x4T;^;`ykzKL^+Yb%IYpN6tLDE#_++}=
zireotG;l<|zkMvVO{0+U7N>bGvnHBuNn-CpI4iVXCRZXZb=IFdZ%2Lr8%l@!BLB3H
ziVh$|`)CZhq_$s+6pBiU^%|SMid@DtLtGulyjnQzYloH6L};zv&%bf}`9k3EemN5q
zFGRxACvn+V!9EQL!(i_Rp8&_GsX+m%qQ!KaU|~WB#iw4m8V-ibC?;jgXIP%uNTW8=
zOmQualihPfY}?55!NK6YJ<7z}T{~OZWC)Y%x>HzpNOo7q;L?oSs*o={7G3FwsU0&O
z>!Z(suEk4n>TG|e>Xj?aP5}O~e{fJeMTTeVdDdi1=v<}YN?W3JMJ!+AAaK`*w%=~O
zIi_N(&UpEE*>UxOdaS}iS1doe!a3QwgK_5y<~}#~{6`L%mg@c#3c`L!G<L^@jVOic
z?A_jPACxp~Rcz-jb%y;y>)Lnqg)YNT>dNY$Unri;f!v)6_rnU#_I%mEj3$FxT~C0T
zX0ed!^;^KpHZD!?@ag7yu%L%}R0NGTOZLdGB{;30V!__P%Nh8$`^z}Sv=gse1A1FG
zvEu#<3~fe)vx#f?mPdGAw&{K7by2m>vv~^s>5SG;aK!Wv))hb0j4?MYXZ|13JB+r^
zoAp)!2!}EAL5R*c`a(ObT?GMXn^rNzW7T8R8$!P2<8iX9UuR&Y<Ce=ZSmns?8zl)3
zIc_X02JJbMwVe{?J=@MBMN(;cM<ZnEN1Lwal`!u&p9RfH^T|+Q)xix$HXSvbGApnL
z;bpY=x@m3@+cWHi5IpY5J6JRA(r_}qzBQQTE8S!ZDJ>eg6+El$y6zpj7*dy!1eTaj
zkw)V`$fldA?qO3%jp!Xt55!&`S>zS5XU7+=6Z7}djAYUjv<vNd<z(9M%Ve8cp&R68
zk|bVyYM+Q;dJ?D4Y+d$;&7i-h=94A8dbi-zXq#jQxP()L;%^SjYgPg%ak#ed2U3^A
zfBZNpWYP9`ITnGso=6^y<<td1X)Z~~8p{G^lq?$aOFwyAb#!`(i{2jd#<Nzb05;ki
z>IYEhPWGH@g?N6+i&aCnl;c|ZY(94|!Mz8uPh8x)8WPLyVTB2bG^yMR+G;BsqD;V1
zC%fh-k!r^3;nVK<EvgPpf;9p9wb@)$F3;%i=D~5doYTK)#5U>sZ-`x}z3zWbIt})B
zhQFt7CTJo~hl@0q?#QrOuJ~!=St^=s4>&^sQy1a0yJW=uM&zV(uBp73?oy-GT|iK4
zyMM^QBPSTWN#V--$HV)c7y1_G>wvWpbbWDjKE~eXi7fvMfN@*A>!8e3FEs%;f0K@8
zRq<+;KqHOwWwv|X7DyfeSF7m2-e%TG&JbM8w%4Q0RyJV&M<z5K{Ep`~F(!EW<=iS9
zPsI81efCeRkK9lm36i%jqbv5WL}hK)5fB`&0O@s1?iC3>zfiX0eoFvReqVULXAl?+
ze)9$kQ^A~4$=s6?ABHOPYQ?qe<souV+QG`v>eTYI{(@jhn%ucxzjb(MXFKLYr<G@$
z%~|LNZhnhUP@5)r4|z`8@#1dWbV(<K&$Iu}>U=2f?0a_r9wiQ8vGTQuH5}ILgEf0|
zQzj)rx4<>9xrW2h-u5M>@me{tON=30PSKhW0?)JmQEz48GDf*gSH9--a}TOy*m=uB
zrytJZSnh%zFB`&+H_>v21mSj+TWAFek^x(gAL=BhRZCAWO%cxE($VC@2kyI{G~1I8
zY$EYJwy}O+wA=M2ZM_zi2{%aygXu&%vHvt{qP9Jtg<yL$edkVEar(sIPMi)0FM{Ua
zYnYd|Hm)D`b<)IQ0$*zgK}5aeQbX~N>QDpwfy2@-^t>St+;yo&kfp69A*5z|Ym;XS
z>ZN1ogm+{Yw%f4&XS`}CIcYQH<@tE!pc>~iH~hn7stIX;NHHDzIilB=mxJM2gwbA3
zztwp*bFljRWKzQIFB$8k+FO08^7*#mUd-FW&POx~ozogrGxa()7e6m+o8M{v^08)C
zHW;hD!uc$j6C6V+EZ?vawItn357{q}WthzW5*5Qh{=o&+$=l@$w=-%pVXDB4ms+X0
zx{!j<n@>)V$oWG5O48A&2xrM7C}Qhiv<H@J4H-T~*X*5f7O?zFRq<+cx%=rw_l#NM
zdUwKMsii?&UU9F~kscdaDE5{@V$SCCB$&KqHmsVjrPAn!V;XiqScZI)+OEH~KCsVO
z4#f1p5=nLtm;XttfA^3tpyHd08B0eK`yy^ZSRgEjV3%u$SKo(Ly*zd?lExX#QBx>W
zwVIs$h?}8$`%U$9fL~q<lIp?@1>+mG^>ZK-Y+PdJlg=*RuR3@e;(+MP4yH_^*<BwD
z?NuZmGY&8oG=~yLqK`PCd`{)W#z&_+0iCI8b`Mae7apc!)EYA-^?Px_4}$7wtmvYM
zhE+Z;by?%ZaNYKtUs6}VrEJ*r$yx5p>at0>EQl}}jaO5N^2Rz(*MqCKer7ovhd->V
zMSA`BTk7%(2D8GgM&pG_lBNQP<~BJ;`;;WJMBZlK3?HH~Pb4`1?)<L5EtOQKEO3=~
zxtcLjLb!JRC2SzNNc1N*BPjId#qT!jd0D*(4wJSWn)w!oso<Bgo3;$<e!-(_Qn_MR
zgRN2YOvBq39-Pj*o*C)#u(NL&&H3JNNDrvNY(%sllDVvtp$-=O;kA})@}j;4l>`s{
zQ<?oAY6k?qmnt3KJs5`C`eR+^^D?O9fyFZ1k;YlE<cXS-ca4m<%H6L9=FpFllH@h@
z00DtcAluc3txV<Uoj=dR<;11TxNik%OQP>X@h3RzkXIlP5h4dHU-L=rCW&tWKi#dG
zk<fE_4!ma@{FW0(>IRb?@Ohe+`mfU%?T5y(*#-ct$6YAf+>IpGW%LX1Cr;(Zhi7}<
z&~)=Khf^u7E^DiBTiewg<2s^!P9HwZOb1+BN%eSE0cH-Xfv06rrInry1FXj3RnZv^
z&vJ-R3N%!e(>jJ?V09v`?FG;l?OrcTX&)+0)M?XwH+ZpF6`$<%d80ewFSbjdRq%ZG
zr*8i&<B6J)oLtlIvvX%^RDAQv%JypX=+y5lqKG*(V^ucXW%<t~ix$_Wzx~gQFr3<P
zX%jiD-%9BZ<3AD-kF~bL<dRE5L=fFSD-SEDe?DHWiVDJ{D*%lGc8b)YbeXS2;!rC0
zuN;GUvWk>T$2JJDs546CYSadX@DewKwcU#odtCp7O?$eG4Rsdd@Mo_1bC`cu&KbX&
ziF<l*puw;(9?;!EO4Dv0{HYmVFJKJAU$s=Hj@0P14r|8rAnV?0boF{?yF6mP#+Fkt
zUqSO+0LktCLKx~kzI(8=*z3S5#ztPPO&eb{lxsF^(Zye4TIjl5vq@N}mKFA{IK0x+
z=w_p45%$K(u~P)Y@Qg?WMyCVDn;lvcRpWc|)R+x@-*@YfQZsTo>Yf6TtuaGcSgmse
z^nCdhy$w>ooY3E&I_Tww@oCKE%>rZib6#)e;4h@zn0=c@JDjOor3h^7w;c+Ei5^P~
zrFvF%`c6aWiLcjSI$>X*`6=OFaWaf7b*nS2vq{p8owfGdg<c4cg~gRA3?HK=>c-oV
zHZo&LmFF?`AY-`$-8j<Mn!ME8XU$W7Jri)-cq)~t^*pd)ue+aDjo5xUqrbm)omG-j
zS*y31w%!joQj?<xgTh{szkGA*%3giUfForlE$JWs%IWs49J~wO6-uhpNaVa_B-L0m
zE=5L}%-xlpok`0bI&&pxiNPg^PN-%dxMm@TNA*dA*nLet?E_wr;^th<#(4L<$JBSF
znwB5~9zWUCO7b}5n(C-$6p@z*bNuLq>E-Z>e3>+DFROYKEw>``>8ff|(SFO7>HfwX
z7b9`PfTq4uCT#+PCSGPkga89mvYNlF?I|$vu_68sM*LalF0!4M6sc5~TD-V-dWrz&
zm?1x>W(Z{Kt?rMvlalceBt%#-bT8(D$jJy4N0IvL3E>IhK0$b=wujA6nvEL-i|sVF
zuM*Jc&k@){uu2FOb1Tp&Uml;76>+W6(X#u{9%FT%@iZIz)RY8wAg`tHeF@^97CM<=
zV{p8!ZgAzb4VhL(20qo=hVzRL8cRAMr?G1ptSSp~Nh##+?`R|p`;8V6#orpzd=%Q_
z?(bxM<l_HE1n7a;MVL-XL0UQ$29w(2mnI7rTm%)+klT+pe}1(GIFjypAtW^@dL`6T
zZ2y2k(SP{e$xP6U_F=uM#buk(bg?3Dl7V&5|647kI;__t#OiZe53G;W+4!~aSTZiJ
z;~8JM&`%D*-!XqGiR=@ZuS5q?a)UTJhgQ%)7J_k36|jpm_nE=iqfPgGdcUz;Klpe`
z?Gn6>hUY>M(f9k@bl1cHVaf4zRiSfw_t?O%BFd<LBgML#DiVUDM*uEiZ!HTwoIO*S
zNN$=x#r1yR#uHpynx8a%{so7}6v$~01;x;6N_XR&nX8Y$dF7L?S$LQIGJJ9uY#^mH
z&fwo=@AN{)#H8?ux3v{&P3d9pv+P}L_;GQedyqgfsU2k%mb=8WU_gF+Xgpgr>9@Mo
ze@)EHk^7K(_aXUb^`PX!?0BhB9&%fMu*D;(mW(!z-p5h+fpab8yaNqh3aEyMOPGh|
z>`sK;63LqD%~}rOxA<@4A@gc9c=>3d9B02R7t*~C%On>4`f@{xso?QBZB+2jVM3+T
zeZ|<_X3LGT$4AVeW}zQ_<Ci{keiHCC_VL4uB7uddZRG-P^55$1g^pQ&HysO{WlBpT
zs!d?em%uIvpfOvXiE$5m15J>eqxWgu{NijPis&tH3)-H|4Y{&kvP!!dr<h<VCj9KS
zlx(r)thvpQ*B?xg61zLGHzkpr;?hw8jkm$e9wGajLKJvs&yQ_PZ_{6$dL2G@Yng)!
zlYjB;@x2rl7mxrdcx>|W=M~t}6$Eqm8TX*6p{JuWUtTL~IH3?Or8L%9na^p8fS|B9
zH?Z)Jsl?@}U)_by`J+(0=B|*u%J_0E^;eUApq%OPniZj^51|cBSwunm2G;e0&!>}?
zVTM#(4$e~tKr7WaF{D_YgZ}D>=~@|`-S4%4K13YtnXlB<J78bIFlLFjqa$J5ssxL^
zFEU<VP*#t(BR0kb%breVixtsQR;TkfAIqyMqIfN&Ty>d|COvK97<b4v{Q`N#lj@LP
zMZn^Db!eT93q-a?qGK(U9Zn(b+At^?aj0NKI^dFr?sn3CP8gtM+D>&QU&UJ<wD)M9
zMgVL=v$vt%ZFT2HJu$Y`y&MyFOrsI&6W-h-S9g{7T+S&R<Yc||d_-?LdL$h~J}<wV
zqhIYzox_-9N@;3~WX1F=r$+>Lrxm2=GOB?j6LsL<Ty_nZ*CJki6#`0oOEX;YE;g8;
zNNQNR1DD(LYk!eoj(Ot&k%g^U!n8I<+RT_A!ylITb=-r5OA_q~z9*_;q<kPBznv|V
zF;c1b%l*(1h357XjFd8lCb;Qm5rNkJ#;`9>8ef?|lIV(G&%`Y5=^D-eTyK9j26Hg(
z2u8r9kx{K&%7Gdk5F0DB^``DTSs6{3w#Lq9_FN)NoFTY0cb-x=#}S>8l&jdHXc%Dl
z>VVIF+I!&+M5eV>1(Rm$2EHDqk!(hPfRW8WcY34p<9Fuk-r)A<p)mzPjIjK6nM%H6
zv8K83CbdwGfnDt2c(C0s$K6v252fP0*_k%Be0Tg^_m0B$h_=(=Gofv;6fKE%-Ts`<
zt&EmfcxAVMjf5VaD!W@il8t9oo=B*&;S<nJD#sE6f9X9m+q_#=n;9hT(Z1+c0!rWZ
zx8f#&EW&*8*l|D~$0c7Ngq+o`=0@4l!n)P5;_HQS!k!+loR=~F=_LVUu^v>WwJ<R1
z5w_WWcyJ<+PW@WAgf>!%2-zu~SIIB!-TV=y_O`#r5+IcPu&zOt7!0q>4PlxI5Xc_(
z{>(x&#V_EzMA6PLUtNJ#n`ts+tNOvoAN*4d49!j5OA?s4j8RQ2;4Mq{!5`J4@_K8H
z7OD?57EgZb&Fc;fqigK&*e#UiO`?=dhH0$g2WN-0X+8FS?e<v<kqIGSs=XHN%%c+d
z_;`XEj$@{#S2lQMt9v<bQca4v2nLxiSU7?@uLc>o42<BS{n$yX<yZmWs>yW2KahsJ
zU*2d$8QpN*bvHPSaB|@w6VLo85M57!SxK^#NE8(Ug=1N#v9%Ibgd7+0y0MVnd-FvK
zu1#zwX`SLch&*KK#M}STw;xH0D$v~3Vs@G{wx_xq`H^;aJLiD~B0N}m@~5)30!x2B
z)cX9QIg6!&My+1icEN=A8waLcM-vt%Qz^x70Nd_+S*^?T%;Un@cq*tMScNbvji8VJ
zt$)$6-x|#WkaNz@@6qAMg9m{RySypAP52`oPYz{BK|ONA&Kd}_%$lF$n4a!#4&eqg
zK0dDp484W<pg-{2FW~{wygdWY+gh7DvPx@5Tu+jjLHdrxJBz;@PU-`j933Xt^VX$l
z2Mqle+g(XzgH*yYDJN;Tc7ZXG$1~Es>Ewj6hH`|L3j^MYZ>=uAL^98<Y`=c(c5|J{
zbt@6T0zkS}P~*?FeoH))kLvOr2+KN{s_e{N;Lm>f+wC|NY|jR~r>LE$nh>^B?Fb{n
zVfM?8E#45vz<6dzX(zn<gzfIoXFPG-=I~xN61_i}?G)DPW0t)4ZE;H~YevZYA6J*x
z)<><o&XuEY2-`FRG~AO&M|_Ul7xf4`20q_tL#(6KXq}xe7VV<4w*IUVtP+#!{bUe@
zKd$M8$Ru(3xm@977Jr%&-V#I$V1!+vI0<`|@#}SXMqcTU)cqv3G8)Ht;CsOw=GXA>
zY`A;QS*8YeUuBhKcbtk}ys0q}5#MWKbO)k!lcfv1)ee$uQyFX_ToS<JDRnGGm}tJ{
z!F54`sF1BJWkKQ&2}^ex552l&d`dZO*SJQzV6XX1#Mk*Fc?rVJsjRzW8sw4SVGuvt
zOYlYH^XxZYwXwTd!>TrWXO;%<d$K!p#F}+MIwzU=XkRgC(01E+bl@lrQ(GBUne0RC
z4_JaEW@ZWZ&NK=*T=~(PZLV`tw2z62zhHZ@**F~Cw9l`uHaxu*K3N@j7M`v><-FYX
zSVGMn?mh2b>k3pujP>g*R?>ZWM>zu8QKJ;Ww5g!g9opuy%Hz!6Q7mC|^hmAMvc$kZ
z{xk!c`}jQcHLOrGO^vm5#}r=R4Ra{kh_~1omEX>6muvZ=-wj3wMw&~r|Da+w{cSA0
zqqadBL<omDp4D(=fscT>^iGzIp0V|=dHdmErTJVW*54X-;rvvotoU~fY5ga+`igQL
z1dhuEl~)M?A;`RDi{bMMt`9zC(~kRA;l_V(=h5|E&wvdzpqsa>H`4@z6w+rKf9NGF
z9o%<9&pPEN&Mp?sRUP7Qvr7xG${sak20$<`;63YH3Mfh*sSxKTS`N;9oyXzKdpva_
ze1qY{6c6l^jeGTvT6Yy$ww%YJ;%K79V7||-)|=Go-YMxA#X_RLNkY<oDa5kGl77MU
zTA)>8Pc-AwM$!J!P0h2cJYShZDGl1^v-%jd^~h!2ec(o<PckMD!0H<)3{<kGgwV)W
zt))mrds#Nbc3nEqvZGMco==%M%}}+I&S4Pnnud_<%&6#+c;j~I${fnae$j=UfQV;a
z-|*7+|4ys3nBTIMDB~PwYshs3>A0grInmaKKpgTJg>Of2lp9<~;B@CDYp-JPVS2zo
z{@e>XRp6sgt6_njy?J0JjyW4>K4FPvdX!|}vtFXkrm7-3qIZf0IMqe&zEB~$rjrWr
z4s1-W?A+jss-XoSgVJ9~b}VX>@ab3Tv+eDTKOGg?$CPADoUyB8P*qtu662gY`7cQW
z>c(zrScAdXT;l|XUZpaf#1B9y#xn<7y^o=E{#v!4?GbqDg1oZ*U%8c1v_A6IaLb)X
z=Ip;ipngn!ZQ9}XAT8S=&>by2@`m;JS$~Dou@Kj0nUW}iOoH|1mRH7V*okEYJpSBx
z3LgE89FmyuNu$aa<i&?J2831%KgY+nz~f)rT&~|Wo#*5{-Um;HCiQ=X?_qE3KA{%?
z5;a1vkVNl%Xx`P54<!`6!sn_F9xbEPUBJM&e4gp729KxSb!|I0zsugd=-F2D_9Tj^
zM&~1<dF;marg})3@ax5X`%aD5P$~^AywRLoUQNe($mE#byH_*4LgFb0->Z)>E}D!E
zR9#+tI-dmpk<74pzrx=d5ksk-YI{^IfL^l|uxZfJXM2s0L}ao~;Yb6nC-t18ic={N
zt(%m!#L9I%S^9A=$vK+z@Sw@-8utD8tf7wHsKUz=JW=6QSWN{6!vbeT1YUvxeePgf
zcmr`}D(D<1z733z(k7$jRuqd_>5qseLPG{6pKtR#D`~NdNQ@@u4dGF2LPHl#+584F
zObmvEU+Wb_ennTY-{vZ5fej7~!Q)(`U$Nh8e(yHa+<V<w;5>py{4qXWc)BZ4#;u8_
z%-gPJ3Ma4`G!$f&5+42}JJ;PCCYA<*;pam`1HEI1B^Ql4COy_fI;J=0EawX#Nd6KY
zMNGv{6c0{j=i}8}6m!1V$)brXqqIGt#>*1u(fG_CTl<a?c5;uXgu^ve4_-qS=1$t?
zmEoQE0|hD9B9b!ssD~6)C=RR^+<svJ6Z*67zXt<;5D^ov4R+1Q%cn$~h(QzM(L7Zh
zgD?x`D6ZswG}1L-^AqKR+l@Fhq16NLVUcmoNFnGl!_`_`_SNGgLI~G`XY+Fw;wM#-
zZ~nix^diz>MsKC~zVP;Y9Bx!Q$i{YJSjfk7WoLJ1Se=@~F|&cL0iB<y4@~63Er5`p
z<)Vwbj)UFlx^$^&HDb|9<S3qa$w!m`o*)S5D**1#Kes936?*%pHyD&z37_k9K<3GZ
zHrdrO_;SEFTq4%N`dN-pYHt1Bv3@Y-9RaKp&z;4|Ci^)#ZPINMdOpSqH$@jg@HY-(
zce4qje?I2FR}Kr?AAO(Jl-rrAz-~f1CS)wY`0qt*kip(y`MKy$?dQ7ZB{?>;@h`5&
zD4e049gyNT@8ppE_bvF)0=Pj#zKFnCh0chGsIYSF{ra;TEwa*N&&DtbRaYi8!VJp}
z<hw)DLxtGCycdv@{S`6wrSr$rFirKzOw5NG;utuuyCA+_TLt-CycAyOsWhaYT+1>_
zLWY`Fc*}0FKCy9tvz?BoR`#Z%IAn!%y0@8Ri;0i^8MeU3!lw_O!yr#_m{t3FZJ%w)
zJsuQ<7K%kAG}`JuV<IUh_7NuJOT3W?p4ocGi2zf#N`xO8ogTdyYE>8Hl8Wk$clGOE
z&W>gsIQMFO-&&(~0e=+-bTobrhx3>jxc`ht5a7|vhtzM#Xh5#9LXSe=vAuF2no6XD
z=81-ELnz|%h(o~s1~?IOqIB#EyTOa0Zum}F6M47nEbrJe;Dx{Q3k-XX1tY?FO!bL#
z7e%JI1$kek`5T{E#uu+TigONpSwZ|VD`5@_@FyZr^6u~x<fM5r<q>43j@VdKC+3!o
zafMBpf(`oj-hA$`A(vk{`^oG-qCbSIEqOuUVZ)pw*?$v+rP<~ln%l}TGw@r#Q<yKD
zDJ#?gJMqgit*uqUIK@(#stds>I+zVCJDU7-5*|-@Zzb5=Ht)3Dp$|MZ4o^jZGx&Ew
z5DN0d$|Roqia})+^Ft<}XF4d37HB$#pCeBpQ%~={2}M@spvRzFu*-ZfV@ucdY3$uL
zz__j<!qsz&X)0rmq11}z(L9T(>80yQ-)1`YAcBXZpj|T8XiJQJyb%1pP=&jHJ11Xl
z+sk`3d8;j-gtAP@OdGP(!WK+G_)ME4mK3YyuIoEoIsqZXl}5Nd&9cIx5BNUQ;Of!X
z6D*$Q_SOG{%9eq9syZfkw<i?$FF6Ulyj|VvTlXn_<ipP8aM+h}-0s8KMN;~chLcsU
z-2|0UPTS<r^^lQmxM?RQ-P`C!x>{MBTrNb$yLb!q6%JcT<M#1<nP<u)IZGD+9wG%M
z!4B1sMMJf#ZHlRUF<WZ6>QBS*7nSO+9UNZ{<#s9<M>8!~X@AZuPqrb}Mp(p&b2x!N
zQHI(*!~QC;f3S>Z(}t-jTNuG#+<yWx)BeOx5um&r0*L>2po#8&XhFs0ceuQ`iJ<>X
zZ@wS=d}ePTNP{arf^fGdb<ZtcJPEhbzTb+Lwf!wu8>MJoGztf7wnrp#23AB~o~wSz
z<%)_qpNz;1x~ogF9CGpPPvqsjAB-DIn9N&Rpwg`6dQYnnEse)pI3TqSd0!-VvDFVW
zvkO+(NUgNH>LV6-D3Hs`g-2xt92IZIc-3E6k8DE7VZUKK-S(6y6e=K^&St>T-8m62
zH#;+N?S1G;Jw4B3z*Ti#OZn3|{96zKw(#sOYP7OOh*HXJf8O&h7?Y;McJMOj_T&+c
z(*B^D8gej&2$&8>&a%G2rdq$eLBgaKP%b+FZvp+VcC6LDA?lXTiKY>gPFr1-tKB6$
zj3ia-E>lmt6CugtFdAka)EpGt8>T=}dj>MSXOp&vHr!B?SW7Pz@k$<lkcp3v<)vn+
zGLbj@Je!Sp;=bR!q~#nrjX)r9^SwD*Snn*h$UCvq?xtpbd8&KQd4`H8#xLQaDcR)s
zd^jU?>=HWV==9u-(jIUt^?QSC*~uI7!`HalEHAYDh|2u1!x(g+bNg*!65Lf`;ux0P
zQ1G&b&TP<mY3HZxoGI|WXlWF67AcyMne2G3RjS2_z<k2{giiaHmW%sW-nTEpISnei
zbPCyDbEJ~!XUa&i(f%`cMT5Y6L|>vlMa>8VC46_z+^`HfRQ=erdne@^;g(v%t<L%+
zY{BV}2TO}-wNjr-tyC&)Pv|6SvOke4Aws3HX42JmI);Ulk@>QgSKyXYNK31&1H+CC
zbn1)R8HFUVtcm1X`XI!tB@^ozdh2+zO2kr2WMpJa-K}F4@2it|+r4emvN%rfT`W<r
z+uOX?{{9d~S0L47NGs{l-+4vX>dis`K^DN4dCR#ayG)zgPLe6v@W%99e^c8GQ#q&b
zRz6o!l@g9&PDj^Z(yzwus83hX5X&eGpIfr%Sz~A1v}<yh%Yl0to5Th#_VOu{!T2)w
zI;epXNtas{X0j22JsU6LRrZU@77lEuLiDxcR<l)(CGNZN0CzahpD(ZSR#Cr$^F7eN
z@Au8g%Ki_pnHDYvaf8v{Ne+*7Qksj3eTd*-gVPex-H{Y)^*%<fT%H}MO1*dO4B<Ki
z?cF<pBBe*^I0nt^BX-+y?wr$YXLri?H14P#+EmfszIt?!TwS6DYXHQ>_W+`wWt!Li
zG^3wjkN<c(pB9?2n9QivMA5lQ7b?~fTP#)vx<Bo!PbMD_t}xURrEo~8QFklBSxfBT
zmzA0FhJVv>z%E5@WACxBiW-^Tn5%v`h@p8*-^z_6ZxaR*(imjAje2oBrqi}ZlY;j!
z%h|12K#eSuB9%a}WWhcMD4p6stlm@4rf-mmPiFW$+~r)f(6p@!4)3==x0r6D6nW9a
zy?krpQc7@}E^+YC)H+AWK-wLZ{j1WL?Oy$<?h01Bc%W92M}16;X`9qy9Yufl->1V5
zY#7q&HEM^2MMYUla)qxw1ltTM@f`MthmEg5nDM>t&~aBTYdVo(HHUQO_<%}QXfPaM
zy`-vq)z8OOUUid&Y-`g_6bv;<9b!>Ib>$2j7U;#KGhj%VR@m=$>Lo*IJAk^HQcxO0
zWs3zhKEa#)^kJu-<&dX6cbQuQ@>}Q%{bw=$l?qcQbM=J90!y9@uc|1Zd4IbGTfy}F
zS&69Kpf4iOa=A4JOIF8*>+m{IA!XN!-F90R@~88SuQYh#I8rL|zg_@O1g??PN(KD0
zrJ9PJ#>g{AtxRTWAPMk8?oWK<Jmso0Y)NSNd!bd2OE~+J@ic1XBAlNOXy&)a%fg&5
zi=|kFfB<P{M@{z@-TNl%(Olql7#u}BxyMs?@6{hRZE9kNR}4yj-L(;G+D+yoyB{To
zm82BPRO1$S7lN@H<i_Z<m`xskO3VatoZ^E!o)CD29d~K+&)gyoUn;J!p%KID+y&oC
zprB(0VDT8Qv@lA1UXU<nObaueHp`#W?eIP|pAIr`TTTVqnzGEieaRpAc&^bp)bf5W
z+@P(I1wV!-ePfq!lq}vUi$S$=C5P7VEVU95$v($f7akT`Q>3gY``VpQ_si*2|0b&$
zZQeR-hm{M$h3KfgfAO2rRZo=@(|2Y((o#(szx-Yy^K(#l+5rjIIl_#$!>(4j5&=E8
z)myu#l&8yZcijo&*EN4@|1FX_0vI1Z_7sJOk8Pc2O?#d$K|C2>k4CZaww;yHFrC9)
z?u_*k9$^1!Ym`c?QDg`hQmwp@@K$biet+KjMzLVllcK%^msX!b`M8C3on32M<KQ6t
z(|@C1uX=tynZ(cYHnTj7ok&idx6sgE(%S>JYz70#)6+n;YG3hV)OT=a%RO6_;I3Bn
z=BkA$?CFoKuC%tpz;j*J+2uw9(q;9GAZkB{`=xm%@qlme%t5a6pQ>~+G7Iqt0Y#c4
z;&`c~SQjkp2Z>k)=8;aL+pjBz#7e)pH)q+`(_BIt4dC`c3p1!rx(0AGVvW}yyIPlG
zzzcs0FnTA>e(S}M&))%dpy`3{GTYRz*!h_>0^tsTep=t73@w~Wab)k1<glMut2V;P
zrYg*=Y9jPMK<Feh@Df!YA-C5?)$YUMT27`zYSZ7U&#Ihr8y72_55oqUAAJg#RL`FM
zp(r0qu?mPp0k$cyayiB)SH@k8TN{;oA`xy$1QC{pxeb-g3h;lXFc~P)oAbZpLe_oJ
zO-igg5S_2wPIp{&Ntr3r6f0S@&sZ=weMU9Q;b!SY8(^ry?b$Pem!~wFtVoC1#`1*%
z5aHzKo0gv2diUWs_K4tx+e+9$@I<%xQkI55dUq`qHH5FFZJriCUb#$F2J!j>(!<SB
zWs-jCH7LqCB#zK2<F$ep_NVj=zcs?!>@;4DS?8{!+tz-z(S$$YyGoRI;7_RTQP1kk
zoy_$_l7E)S8L4}upVIBko&(yU>rGbmj}b|%R%O0>GP`YpDeAoKG#Z<8U3r;m!c6Zg
z)b88XpYlC!XCD7Fg%>Vs%e;q^!=_QPs#^VaNX~Kx^Ae?uY*sK`NpJB{Zq<@*`i=H5
zhYQQFhD_N1;`$?!HShphIs|Ea@7In!xo*et{J^%v-!ge=o9ZM*BfTdg3-i?3p+=QW
z0}Uaf@mC98Ly%@C2|Kg?n9d)z>0G^Hs?M%eG_3kxKQLgJh-ag$<Ci;&akt_fI5)o+
z3^qITZk($TJW1a5Fl@K$sZ^`B9$~-HyWF-ZuDJeI9`<z<%kQkn-<jDrlPOQ8sx#Y@
z?dEI0U|UAK*SkJ6tX%P!hS6(;?nvVJZ>!DDKJMBV7{{x1>L$5^OX@3_P52ol!^0L9
zDs6txKlrhc<N@*`p{MOEWaCffRO&KkG+O9e@a`Jba4hNP{gG5sY>P*;k_m^bG&AJ}
zgb#v8uw08{4#1o&F6m}M#;}m#aNS`x=!*_S`&1%Y5y^bMJuV(_v&FQl&SsU~c~pf`
z^11ptp-TU<up(TXP;#;9>&!dmO(&z1$6LavV-DEY@ojn;aK7C*UACU=E=!RQwprLE
zlBqn6uJZAW=&5?Qu0eW)Cbmpyx!O3K-iAY3d{2ag9pk8JjKW&sCV!Nxk44k1nlEt-
z*8LIfe!b?kJ3Na}Yw1bvHC5frEm6dgWO$>-kUH#9wu}AiCdsQ`W%H~rP~|?Xn109z
zi|$dSCOF(EjUZiV#cbB9n0b@RX%V$K-}nD58G`MSvB~+%BiU~Z4CUTCa$h)*88_&Z
zBHD_9p!Ys3WAV{GI@5|?6h&yhd~kCN@5t*^&io=?U1}s<lzWEmH9q&HZ-k2szzVmg
zJ14<~V@}mVY{}f*F2>^qre;;x>t)VfTX24LLkmJq(bGl7j3nvOZ@@=)=43(eEm_SE
zRObQBa|#Ow#io~+D^RPX?!U&$ZH7A)bf&tY=yCjF8lqMFX7j=8#X&br#8ao4)nGJL
zBIRV)xtQ44E>wvv<n`rxLp5UOPZW2pjC}-ruJT#MkboW5jwyDC3rNcL%$I?s$A^M0
z{-yMQZD%>47*+luoIUX#KCJyDRHp#e_9u8xSoMs@`Y~P^Si>Rh_BwQv)y|yn%juEx
z)XU*l?xq)?RH{tbMJ!Ln$(+w~3{&9kpi^Sd<Gj;oIL~41CKE@z>mLREOd?sKtlVEt
zA$d#DeP2|7;5EE@pS5~ShL=;TB(;UzzPbO#xeJvF?Ea?h7Xr-P`69!d3>k76ilP#X
z#P?Ks2t4bim|%E0YOEB{SHm$yK!w$A|3X;2hj%5N??4MFyx#aA+)bCHOm2BJaqo~i
zC_e!$-sbP__dlCl>tN3W<^(a!(l9PMeNI@1qpLRyJJi!=4J=_q(rD?pJX0adna`Qs
zt902Ne?+KOdmC(5exA?l=<xbGRiYeY*MhxQDZq*4E_fluMs37blc?H7I&$}KFmt#6
zkFBo^i>htc793>gL8MbaI;Et$L6DXX>FyZ1rIqgPmXa<3>24T6y1VOJKKp&%y?=cC
z<lq<<%&dD|*O{_DF4LEC+8YSYNta#fSe<<kQgIq8us)vw(K{nXW9dzWCf~;#%<4tR
z7b=cU^|IAS+l>pPaJDgqC)=ABvxXx&M0NwpNf*wDV^Lj11aQsz<PnbGZ9LcUcS-T0
zRpK3`zri9jwL^37_iK&IPleVcizE*3FhS-&DRf)x{K9?&<2ef{zTX_wQ%siYh6jZ!
za~5YAEa6TC`6Dl^$NMm-GJtnXu=YfO032(SEtJvH7PqVUzGM0_OtUKfW{<3udNS+5
z6&7YmIdTo$jjiJ$5Ls<yw3Eu+izk-@XgaH-NlL%>#k~7H%P&=-s)o@y*M)+f6)*9V
z!HPcnWSOc|Bpj|k8EM<2jrG9$%;(cIwFn=~Wbc;lLWzw9`ZFa-KpX@?i?vbAg6re7
z-w?M7I9(NG)b_tn&m2{^?ua8O{Y;i*rjOn1nrL!hYA?RIITW8rTJe(Z@R*{+8Q2sg
zIV@%hN!uU42joV4l2=H*{MIfjmHaRG1Q`UIJ)1I4CCTp2$0vVD*7kA=M7e$_%FOlx
zkHbI!)ROJ|ltw)Uv0!~G2^r;B`{r6%WlI?tvqsTJt33D!?3mk`o>@G8zk5jAc*9fb
z_Bx#RXx7lW260gYR5pJyt<-6Sj5FPh|E*booK2=BD=!UfQr>~B9xU0IZNwseM;yap
zxn1hGky?3<uSPZ$Ex|G1Ry))6j;;{SRI}7;-nL%he~2h2^QHuQl`pue!If>bS8f+Q
zErk35t)uv3gUrP2(TxlUI;-K|T~K=kqk0}{Yqt}<{lWhbZ*2gZ?NXWEt5Y4y#Nc*`
zDgQ+~q-mX04y7>5HAu1ABma%F*LCei-N#@yRz%A`)Wug{E5gHJSv*WK4pc9yc@NmN
zcRUROc^xjzAeTu$7F0)TGrR0B{?Qk_H3br(!2*Bg6F-nGS;I^$a9%}tz~qgR_Pa;h
z_z+L|eU8%3f+XgFzoG`gT(&2e%mhXQJiAxx2BweHsrFc$5j!!O(Y2EPEE`C&N#et}
z#=<DtCYZz1i(oWtZ@S>V@~?QEG)fGGtYQj&SsRU^VBj5%JBJ}=zAapu;&|r}K?`qh
zwLnb#mY^Xt#O3rF#l5bGx0T%-=a}O*_pG&OF$?J}!&BLAB^{-j!<a8n)iXJn+dKJJ
zNTtmn=DN?OQLaClwxxGYJl(`X8}N)cWCjUtcWLdla6WE7)H1v)m-6}-4kRN0>v!c*
zD;_ySjLgO|q`M3pBB`@8nXBT@)ucObWq5j>h1=jCk7fwpyo}!v63voc&s2U&ntSSH
z+rgl^XK5Dm{q*zm{ETsB>sd>Qt&b3%`%!XVd^E>ZI!+iZ{M8pC>s<swewb4-iQc!!
z!rucgkEwgBJ_}V(!ZdGU>q3Jxeg~>{Betls^<qT<{TlBMSR-j>fStb({!imxh%4a4
z|48A_N3KWVOY%^TDNeAUtoOwbH;JM)lguo8tts?yN&meSc-CKki#DyZD;MwB9<_5E
zC+8E!s8sVuewDa;=The?rb$>~OXzg@wGk1eYtd^p%q-jSE`$<1%{d5+q)hspbE-w2
zIzQs>bTNntYY)(#iReJlRQx*ipW2cUWPj0gz)rG81(Rj_MZeRZ?|Y!7(yTZpeSt12
z9c+{0p5|ys*2{T)z6~VZ2&%KilZ6D1pzY5<>KOupA8x;ist8;q`DEEE^LU;Jfvll7
z^vp6|z8sx^GI4omOYnZj%fs*&3Y{VWOuS>I$jxW-INu_Y=i$-D8Dzwdr}BJ~ZYYdk
z)L8&bZQCb{2*NVCC~ilnjhR{q!NO61zzF}{U~)~7H?sdyZNrw~k7)LV{e^wjP4yt5
zmsyiU!Y5kZNS+sdH6Ax)AsfeIjnN(*YkHT=lBh&%7NM_ux0y7Cn1k|(^o5_ZTn`r1
z#TRVmf2LTB>Mh%2!4x}bGVqG@Jd0T38ek=Z1tee<-&LgT+w2y%Q$D{w!uF<6PcZzr
z7#TY|$33cUl!<jQ6@W*6#f5u_NR^KLnA+deX8On$EuDbl+2yF(YmL6)95awmDi72Q
z<#ysbo@c`7q#Sog8!9ui=VwP3J`2lI@UT#=1b8@uHB%=Pt1zqj@HSBR3ocaCYVnO)
zl}&O43_g=P84m1vu{+!=(J9v_5ZLO64zh+EChN~wgS~$sd>BjE{u4oqv9U8u%^l<6
z8iv?5$5L5u&*CMlUp>?kgi|Kef|+BP$!EVLZ)tPhxkLnCUwIddTX517mZ&5`1>?;C
zp}>KZ*s8zj2R}^};i_&NR0>?%KH{5^@>Sx`Znr9#Q1Ve{upb@>r?_0j3<Ue!6-3H%
zQ@w%pGt?H(wz$uxI##9dfoG%^M@!RRRVr3NfNChGCFF_Dy$_yj`tVzgh_&XV-x|Yz
zB;c(*Vpa&!y_s%un={BTk`v8wU|hon<@f`1&nID7Hw3@DNZ;nHmkd^DIgH?CcVPmm
ztoS+g*W=KjKg{rW$`;?z&AGMFwj$W%X1e>Zsi7gg3c@^3IrRMJK|<R{kK86A+@ast
zZ7%FKD-XlD-fs4(#JI>c+s{UkS+m$Nb2U1kQvD_Caz0#tL+?fFQ12vttF+oQjoC18
zrrsAPUdJ@lXXS%48AbG8X#J<S5X#`%`>1GHOKSwTrMNJGpYrt-EXirB#F)j4V*BX2
zr4ve3n0E3*6yWizcsG6Vw8=$OxI%hL1@XA|`Yr}?d0>_K>P(x*hQx;L1?j^|s%_S9
zte=*O307EtVwv&}KKf0L7VFN137;!*2!USbkrA)9BBlQOSc?gS_!eh2AjPGd7QPJG
zO2AI%KGEz-*1)vW(>T@c_zJ^2|5f5CMc0+7_*znbc?H=Qdb->5hG#b?U>jAW)*Tih
zWIZxGzCo>%XLvs1ZZ0VWFj)VYYhNS6f0Ivfa#yJx??C8Gg2<~&L0-U1@Rr9<)>jrJ
zx7>Hp{y5z&&DcNz=BI!c85H-Q9VYIUZ3fak3oG*cLxkSH7Upp?lac**C+Z*;e~}{6
zw}GMKr*EWCP@A>B^1%CtF-ylv-tlq|yUs{l4831^39PTZD|jzJJj`wj?GZ)U4yBAd
z9BNVi;$MHQ`JEoPqwba~?8iniGq_Vvbo<B?y_xutttF%p(coAQ(Fx)vV*dT-*cC#?
zVyV_ix8<tH#3a)cch5p^pFE-&NtsVL1x0{s_T_KnYD`OHZRG}3ykuYy9Gnq?Vak~{
zs`Ciu8;JJSa^*)k4(?a@aF}@ks7375;9u$>o@+cI4hxPfhL*aX#v0Sz+03@=+vCwN
z+~soZa-2)j2X^P<G0Ks<SXxK5l(Vf6%!-Dc!RRUPI85X}WVr_GCbjO9dQLm50?r%<
zT1cJ70K{l-=iDgPB?0UZwfX^H<0$0zd27y{7UXKl+t29?cBeVTzd0gHDv5M>MR23A
zsVW;w$*}xxMTV~q_4TeeDKm$gzt2A~9baQ>M}h52*~nr3OlQe;>AR@UZzGGDg5aIp
zumyTeBr-oHdw+gFi>LV<yx_bi?t1DS4KzkIuG<9$<^O4=cI<T*tnymsLJ`b1lDy1_
z-04Vvqlt)4EDlKJVeh0|j|6<{Z5KTy@84|eg=w?A0-luENp@BWP4JES*f<d<)RbTl
zp`WVy$Rs-t-hoLzzc86Fx$kyodJ9T-8^}^J)WueO#PFrxU#{j=*+c;uBop!*>Izq~
za$<0IRjL3KX(3fq@Ut4CF6$M(9nQQ@Sm-ME81}drqp+qiDqyI!f3!$>+@kDREYZOo
z03_6igiRlTQz~b<`6+i)z&r8kc)5Jwah6_$Rw*wFJ}7LWBf}c(<sNq(I26Ba)8w=U
z@71QyRIXFEG+oI1ZLZ!Ki}Cih8JsAQ$?I|``&Zr79fH9^61zJGJf)7>2BrYh$3m0)
zOVttwL9f$YM3p8hcOIW32J8)<UA8ZID~S(z{%q4Fi=j3wHYkFbl0XK8<JxqUz2iU%
zBQG(xXACU!k%xG$J*2mtGgU-Hq)2s<N#&=Vy-X%6)^a=r^<S1qA~N~cy(xNbl}d4u
zX*>1QwcYK6xaP??Zw3E>o~JVv0Ofu=D%FUuw}wg8n0}11Q~3TZ36n*n_898)@VU-}
zqNJ<#I3XWMS`dIQt;nE$Ktckjye#lsS6%E(f<zM<X3@(Yz?l2mioxVY+FF<lMxj`8
z;1x%1Oar7@654pBvu?igXt9-iC$^%Mjf_TmOP&vy_pW|qp?2Qqe_c4>rAGM<RIO*{
z^c;T@aRTz#i)EvQOUi%mO+&MgHcj7p5~8F-;4|HyROyt;D6LoSxbi>72EW39&Xg;h
zZc<t=I9)7-E7RybiPUZ$x6?>QX|vleKtX6OuW;<%eprXO96ls|O#e^;+A%5Tp<BCM
zsI#1^n<e{eG6aeS6_AFOJ@^Z3$^jgo-R;IqCQ%^Z^)Em36=8+qALX9JV>UL9E3ouh
zqkFX`r&Dsv!RWE}XDd}>3JHa*1%@;rS|+o7GLGHj;7ymvt0IlBN>jDQP#*gSyu+1B
zTy7OVPfASC&=+KQXR#U^H2<}6)3g6b3Swd)EXQ^&+n3F{q{}P!Q4njl*Ax6yWo=>6
zPF;6xc@6$TahSejo=*>-o7_(QOSFnD<V%#>t4q_5alItuNz6-Y%SG=5OU|@@sMSI<
z`{GwaQLVhryMFiW0#GQs{%@(0p%e|pFPBWG9Fpk!vH&IU>0zvm#F+5_h^mY)zBN+d
zlf8~>RES?Lj?Px#R}jtc{HXH;!1PlUpRMzgLx7*~T9_o!)#xDa2+4eu<M<rl^Du{r
zjg3XH2P~To&d}MYLm5ldm3`MOA5kBM`yiON5jlrv5jUD)tTlMs$5y*f4X$#+R?w?-
z&wzCe07g|kj(FLMuu)d_XUm=9yNRAxpIQOSAdq=ZO{!X^En0VbiA!3{V>_%P<xIdQ
z=JWJa%A<F;AARwPIR^Yr2NcnmnQPrEh8)X$jTEn(;Z*&d_aDxe%;2p)Y<s5;vn0Ki
zLWsJoS>|^uwlL3IALxXuFxd;xNCvmO`DC7>eZd!blP!kNwCwB=GQd7(IahmEallRE
z3VXN!lt?rJVj*%FeB9Vfnj-0>f*u-3;~)Gu*_~5r=>&gx6n;#%LmDr7VeM2{@klee
ze5)e}xBHnFN^K5<)@anU=s2(SM(*z=vAODQa-qE?0KwgNwDBV|gC|0Dtx(2Sxm`9`
z&|AdEq>V?s_BL3Zy}xtJu*{>&#;4dUwR9G&#TPy1wgNGDd`lzpO)iHef5H!PHToy^
zcy}ipA!`_c$B>oEw?;O$Bb!N65TRN%M)virpv_Pbc18PvSON)$_J1CNl%AleQrJ4@
z0fLf_4ay?PkORRRkXQ^la>PU^8N>&3uHN`%P#$<~)sTNT*4;7g>NSB}(woGeg$$21
z##qEg=c^lUX?GY0LkL_iR@$|SMe_G-ni!xc!A1-!ccrGe@WYOPN6UP-QgE!<RzX#u
zXVS!cxMUc2cGsv6UGiiSaMv?;w&SOmfycAtl5475+@fV9uV2E!^r<k=&Ibe&6zd3_
zch_(Z;VsY$V35@npL=J{>gQQi#J2f=9+(Y>p-$#xT{R$YhnToH9}tVVYj50mT%(pi
z$Lp?)rOFnDWBTW!S88D^6bJiEaViiN_-by$>?wvc_?PDo=6nb4no7buBTI#1hiz;>
z2UQXLK8U^elsQ}eq<ni2Y`0q3&Q)gIzHm3tLI_tAWk*)t{;Vmh>V`sRR^)THW{C|c
zQ`v=@-xw`FT(Q$#Diwartu-c`DbJatR-l=*Z;xE*>@sd=EEqXJgq6?gd)QvFd*q2D
zM$u&i%#`b3=IRCo1&zlKCYm8IfB7=-Ju;w`e|3gLZb$a)Pp=6lT*wyT(+t3nNV#q^
z7x^~>kxQu-vp$N+y?}E){INVUcg6cjExnn8l3E%92PNO69Wwh+E0oJIRc~h$@XjyO
zik<S1Oh1~L8kd$gG@Z%s#Hu$7Gw-r7_82DNG?GEgl`O*j6e3@Bf`5O&!aEpmGg-~M
zX=0fR0Q+b6t%A%6oO#u`!S-@tI!qb*luef;d1Z|g1@e{NdV<N<=s*D}8=gFUX$5c|
z6vDf7#Umc6jkiW`mGhPaIgCb?uZqJa3qL9y!-=||KI#D58}n}ebEGn_lqbL!WgIw=
zP=k}UM~PyK#Tm9IG&`bxR&Clz(Q!gzikAOJO!bQwMAdd7NN{(7B9jzs&LNkCDP}pd
z&l7f?6GW<fmDX59oJ!Pfbpx;(bQ86wrS-O8%}=6Fd&TClmhZ(GhMqey3)IKf528KK
zx8$)^25TK9qt!^|1<8JmczW>xr3+b9!wU{Rwqp%?J|&)s$CZan4>{;mAvfER2Vd8j
z1(|YyRL*ggnP0iXFAturCQAepl>jFI?b>a!f!Ca;C#&<`OlGe_hJ3o_bRkz^s|XPP
zl$}U5{O9=O)#1V^#$S4)1WBRg(B)nF8^{>^`=hC3xwRp=7CWcjB3_Ie0I>A|?|g0I
z4Z-|=sBIdtt8J>ipxr5zNax7hxAZ}b`lA^aLG9P&cb=aB4TOrmRGg?HpZ5WcPE(#y
z2p_M@cZYcQEAvCn^-?sS+t2{kt@z!zc6|dtl*x&X<1XBI7T4N9-dCSAG@~JSS4yHd
z-#xsj!~?_sQ;v^yOYmH!`We6B9$fUzu7Iy4T%!7Wz8h4WcxPfNXb`h@xuZ{muhZkO
z>(((?Jj#^_jt`pA#lA&;_vq8toEXRx!(cj+lVRKH2ECu-DU|Oc;p=DUzzW*9Sh-@f
z*vGSteH5~V$5N6L<9{TkD2-<HqYFmV{^71(d6V9@acI}_tq~{iD=pjhIMobln}E3$
zNUbH}F<!EW3||`FZ)|L;EW3p$7drg?lBo`1dgQsj(LZ_~jXX;=p=>^<#nxVB?`@c?
z%+=v?r^)(hI^;u{P&WAmK)1I1!Cro%*y9@dQ=OhbZ9JNsTA|Yllz)5*zJ{x(<aM&k
z46i$Ajo<nGEkJj_If?QcC1yt#+R)tr0ufpurpJXso3eN6$8;Vk<H6~I*aV^Pl%27u
zQLo`W%7UVqILgv?^Vr%hL@03VFH$zGy{`{*-Wyx?xV3maOjnjM>PQ{8aSWTb0}_+O
zvyI`tMU1D9*1XQ@{udp(hs7WI(r8qE;sFV%xK2KYuciQYQ{*9rv|X!+;U_vN4=^8$
zE+QGa2IW3f=$;K?RP3u1>uU9s{RFyw;|+w}`$t!lv2Ywn-A*ud1Ji}tA8sQ547;ei
zq_8-1uI$@;IM^wuKmK0eA2_}~!!8{MIFY$asXnIS?is1*+Jlbv%q4|3TTrE3Pc_$&
zS5j|vtf&pl@bz_s8_kXUbL9QD^ve*3)iFSmFzbThjzg<XwR$$Y5bqS@nwi9QY`F=4
zxy9aklacQFqe!ul$5=m`#F}*d1D!~x<cq~GHVZ%FethZgj@<8IShUhA95#$suE>=4
zB6-l24u9qM!&sI&%`2~(Yp)8^h?boJ`*0&(;GjIr?5A5yrk6$5BIV?gKAEJP)NGkH
z3AmIH=xA$T`1FGT<D|~!R-^x1d`lDZaH<sSP7jXVtFCMju8bheexTwX^s1u<RQoEJ
zzW8`go|u6gTKeZb+sUNy9-(vTieSHP&N5#7iz6FYEzC4Eql*KEm=PY7%2{^$Sr7R;
z0lb9Ucr2}1%G=tXmT71h14IIhb7TrqkWe1r-JZX^n492s;o%FZ`QtDY>3z!4)Zl3h
ztNTM#XIyiH1r*yJYTbP<`USrs8eOaA&+bzF+tF2Ex<A31RP~$<JfRTj@vUU0NEC3|
z7P1rRW6em-m9K%1`Nje1h{Y!!<phQS1k?Q$LO1oGJz$X_NQ6YbswQ3wAsTz_@92TU
zlf4#MwyfQf^*3$`8|x+9J9UQVNZ>GJ;4qt-D$h)um#4u^ElIuaxXgf>hfVmWLIpf7
zAn#0jV!4C~9@=P3EBJtnT1X1t6Zbo*MbD1B<E%9cdMS-W4x5EAf%_Y;JCil|RQZYO
zuooH3scDXqp}iWeXVx~-h!}n#EUSZ0oVLGK-E4l5Ez}$5ieyQYzq+`nVWxMSHjnKs
z;sYW2KU1r%uRedBW=~zU)F_sb=W*P6^Vp<OiMOyh_Uf;IMt%PM_-Hup?evXyqr>OR
zz6#sIM;*&~TS2;5O0%;nDab%uZ2n-}HukvUomao%`%N<plvgZpJp&X&Zfa+;*!Qyw
zfw+8XI+z_aY?T5gfZp4C?Fq0D{?FWE0y_Bm{o~?-(EUiAT{*(npKr_#1f+QE$@CRw
zUJ}aUrC#}ew6mkpuKjRnkUcVniQ~K0x0o}W+ft{G?GYWo=6!i9DYMVFQ9Nz|Gj<!c
zU)nLS`u^CI;=_L~rWcQfWnorRUHURm4BRg&*&;MNSLrshUr9$YRJS#h_Q#>p4`Fgb
zk37Zpx#>nL!*-7m<E1$lG%BrZ+FRAU5s{x&$r=hC%==Wves-{(yL_L#n5A~eQyTQr
zY{w6deIQzpd*PT5$G<6Zg%KyhwEZ@vRNnS$l#T~I+c7Pct|HZ0(Mp9fhH;aPTxaWa
zY)cZwDueDVIy=sJsT9g5V2uS&ARuF_jt6bG3QoQgTc>)~xMGt8#tb=9d-QCl4HPV-
zf?Qm8glgwzn~UxSy_2@`g*W-$-35C=a0Y-!tbEZ`naZvR#h)AX>i2LGYt5P7FO=hT
z4AXNI+P!Z<6wPX;SFPH0hRN^a-K(VOogV>6RWZX8A&$&?fa|F)B_>#c4#QRfw4!za
zg_G2iSP@#MY7xFZ)2(&$bKY5!O!hQHPy(4FL<8_6@OH(BLB{;UlC5sB>}nO$#q_@|
zqVmAkyB9a~rk@%InmS(e5<l{RjD}JUnbcqMb~Pxs6ao$G8^WQl81?RICS;80yM(~r
z!-_wJLSL0{`lj>FQ#YDbL$#-`9Zw{&a^bfoS<pff=137Hj@|-C8eE$Y3ucIrcD9VO
z=GDHTk9?{78Ew52J6xyT=-+(4H$-2iaD#$_&-_J=)vE<b9a)55qQAp*d7@Ft`&kmg
z$huY;rJrBwu1o*M3Y2Dwc<glUeeH~0xTO2#vWM}ORlMVR5_>WsK!a3M1LBYEJ`r-<
zwl=W0Wc1>AI3=|=f}m?_;Q(W@n%eo0L(04$d((QQvEfYFPwjrGk&WHt0aaaxlB`Ns
z-{6g3vc3yic9YR;n}sUmAtMlX%(pMoe(=d=+%&M&l%hGI7=(7VDVwNrlC@jeTBQ52
zU`Rkj^a+px#E}jFnFnt9wHdGT*4VsB@5fsndnq+<=0hw7GYm!})>UT%T%4u<0$~7-
zMCkz{D$gv09LjYNWr$&fEa{h#>09R7!%3Q5xp0HT-an1Q28<FA+l_4nCW<HXzODv%
z{ki$XA&I&XW=G1`*;#MJGsLT{V#-+e_SX*<5F8G2T3X}U;NHiR*kJO%YPL8n!!L(9
z#G-}st>8HShQf#lrTmYFVdVyH3h6w;^EKP-g_uz+TE{D`)`6aS_>eqdJ81@8rO{z~
zbkY;2-AM}CH%=fTKMj<ANEs$#H+cGE<9$9yCNv`r0oQLaj_)U0??+4X$=whvW;!30
zGBNWm-BL)7@LVZ2bM{$$NijA%v8O@ug4!!+H<R93Y$>-{&3QEy;ZrKWL2vwS;y{A-
z7bs+YJ6en9v<1cD)mlFbr$$cm_{^TosC{uyebycA?4Kzre^ce92x~qsrMo`C5kGMU
z_&<MXH@WL3RkZ$){{iuY;DujcQ9W;fdB2_C*-FdA^1w?FTH{y_jdL!$ETN>GZk_Z9
z`2QtHwhXS~&jLqN5BPYkk5Js9E{BR*a`T(FXSjy%B96VP?1yDkEsBJ6T=<jJyO{~L
z=Eu!vZ3gu`wtW`kJJ9v4L~q>$2;?+JkG_Y((5zi6B~y#r`|e$G3Q3N4-|Jy)UFI<=
zfXLVhJLmbdwsubTwlO?02Z@-Zdx-o%KOU#wM&W_!bSnH8ynEa1le`Mo5+~JQ1Bjhu
za(Uw2jt@JS1E~!!04<=F@w{JDz4h{!Ic;V+5GcSs?5!AU5X)g?)%V%`aY^zwszutO
zo3~ABfyi)Q^m)le6Pfh#zVu%bfFBB~|CnKcEFIfj+VcJbK)<Gd_b|-o2zoji%}_z`
z`5xruRUPx#&9%TVt*7uu6rUW!Nbl;$wc2X2`TM&>SNPlA`$~!-ik3?b^P|%6QzNQV
zm|}HbT>2~91G54)<B^=JPxa86gNB{~XY?cYfRM->+cr%A?wl@c)?h<n`(o<^z*BUJ
zRp7VpubMdMRr0Jr<NlBq0N_*w9d=m_Jk%u4@f5U*6IogAOpcC+SGEa<w?Btf=(cv5
zOsd9T;RsCFjf;Ygis~&Fq7Q!VjT)C6su#3~6MoqFeEK?Hqi9q{l8H35%pz{U^>A*a
zBF1?d=d;#_-<rHp!5Nv=(7jXL*R8xVQWEj=E$xr|0X$imNv@LEi#z9%HuSF_>jTsr
z`E79#h8=Q4G=CyZxY0&=8NZSg=ac!H2m<JYiyrR}P$*u^zPe%y{`_I6=GfrvZ9}Hh
zSV&llgBf^pdo(jYzid36+qz|-ch3M1q>3Y#EAmZeP+e<og1#gWycNlPMk&`GdF$Q=
zFTNu~>CN-0HR|L)xBV|$P_4wUTz&0)W;udbBbU5E)e*Ay_Z#9UjH$27KlZphl7O!G
zy*l0#b7D5{l(4)AexF!sj8D*?>Kj2Pon;2$5#P7knmpk38Z8j$)GHWT+3vlfs2%B-
zY6;gz7U$TEm~e)gZyoCPI4|g={t9f3Haw*-N!&vB&Pe5=8>+hAv7sc8T@q<v0No<b
zS#t4jKNy7<_OzhQl<i^xg_ycBKP9x&FB$Ylp{@lLwhM};cQ2nhZSB(&h%QRCj{8)o
zJPUjb)}VJAiBq@1m!-K&70yV6hVj-bi14Rv?@d6!{*_o_|HaxW{c?6e^<XxwuN-Oi
ztMhY3%SoWSLJ|d&)tspuzQXc7stIndt_2E<{(X->hFItoh_z_D{v=`>b(?CG=n|n0
z63N$Hc)rQT2?3z$`gVW(t7szjGMz%*i$A}T2Rym4j!VN<^*?xDbS@&Nmuqn<0@VY>
z003h)T(U`*o>DjEQ-y?Vb{*w2t@diJ9bd$8`4vX7=Xv#cyU&idZXI7Yfv%OpB!J)6
zZLdObCioljgwr?P_TM5b&Z($N9-yHdx_z1bL7&d!tZnV+d(S=C$@pL$X*4T(H!A3@
z48{GJa@rQAsGIiKUv0a(7Vz{^*R7sn`=7%d43C5aXB$hoAuKg^Z4h;bdb@@|MS&A-
zlDRzj0M!gG@2|JLPhF0kDSm_w!qmUk*NEed2+vL83X5d-bPKew$m^U9UbloE+E`=H
z!<tPL^vsCQHwG0>VuRFP!y|y`Qz75D5p7S;?>2CCfTYz0C#BA0Kp47-oTBp645=<1
z0?Kg)v>=Y{+E$f;D>`w)WDWfnxCstp-wDEyISZmH>*d_FNoLD|D8Ai{*5>hp2AFcE
z*5&2!#xjZJNRs0civQ#y5GZqN4IZy+zq1lB9?YQVx{fwm0%!s^jvM;lYEjMHBWU2R
z3(X8!5#`8qrI9oN<GJ0SZ=%}fynfaNCm}8@&%cgXGv36zTpz)t8A-~HEDSHej9ICu
zqxT(2B%DRfv<0-b-a>N*y@Y`0;QiVtq4i4rJWwjd%i&nPhVN#4z^0O?AuV#kd4k--
z3GWsa(NPv1H8an|_Q>MCWp=iSrww`?YR+YI7vKt8RUO^1pfBp&ETti;Lgu_q$0y=A
zRd#+l(o*K;F_5w7^LGM59OBik!Vw&~DW5S)JfD_618}h;yWs^r-5rOVmBYqRcWk&;
ziRa!g)~V)a7Tw`}(zXGYh{v*(OFA*5g6~W^uRP9tJmNobbda{!tZ;yKe^=yhv8~0X
zJVIUn0V2wI(Bj>PvUII4#b{cVwm4>4CACqsxSV#mV@l4+J4n3eE49w4H%Gi04E`aL
z{(5_I09{xKd?V{g3KDiywZfb!7Z;+&Kpbt&>s4htF{1~8nIhF_8|`*sT2bYRM3k-Z
zmTOacx$pP!(sb<ZyC3!(XpYOq(;DyrRqh~@ALox&*K?ST?@&gYPx<Hmtp#i(d$}rR
z77(F=@ZDXVC2}Cc=O2w7H-OwZP*8MkqR_aRiSJsfU<(8cp!r-HC%(JPU{)D|s#Tx$
zJ7<_jQTT$S>k$$0FQ=Q|_ItVpuyAi7HXiGV4|N|P*j9GLKGxZM6-W#7t|p`TB&|Hk
zl>+rFhh7o*a6C-708=`5j_>359Ww__5XX@Z*GVq9J=c^sqh;KBwubngXyKN`i&WhR
zEu5!uo}A66v&$;w>FY2~ZS8i~r!j(rV0e)iqp|fO4s(%qXpO>!hbu_uo;(lV!?@x5
z9kv(<xY|otk4sB~paV;i>T{Vrj?Bj0zWRFeM+2A!80O08f@Wn!#M}qVwt0B>@f}0^
zq=O*~Q;~bDKP=}D0b!83b+dC?-NL8rkkp2CQoC(&Zlf#sCj0YOK*W@hN(v^-ElSAD
z%%aI<_<q2F@3_fH0iZqq;K8|O0~LuOmBS7S`UU3Rceajck$+91hu}|9xeJ@o?RW9z
zeK;jF1EcNiK?7ARyqD9g0|OQZ^pmO#uhS|YjA$d%S#%gZ1zD@;4VbmTIT}mer;XIK
zwr%k27DHm2qjz1;!F1&gqu!!%uf}1MxSG0V#KUz5{9e^YeJ=qki=-CUnFpcWvPaZC
zxSYUK0C2VDJ>&v%@cf(XPoCyya_IU^k+4+$^s4rw=iU|>jT?!~t)csrst+u;o8y7j
zF&Pgl;RlBC-(Fo=C}31Ks~*ECjNt;hB{|)-%th!b%iV5BW&CdCt}WS|*i6D~YIyDt
zq<&z3ytK4wA+5n+%PV&BN<(xZ36%P<=yWj01ZWD>BKow5mQDPd<Z`JPi)1c=PLzS3
z^CgN}Ait%8vE}ttq?9Q({9glvJYk|z0t1gG&wJuEe0xNds6QM)1j!766`yN8i}lY9
zJX8?ShLX-A*UWE=qp9H&NXqkYOD@)a_16#7qh}vCK;E3NoW$G-+d7r&u5G#YU7O1K
zq>LW-BmQOSCN)T3>n6FT<mj{H$iL$cHGGt>)sX@U%hnK>C&{W2=;>oADt>u?{ZlTb
z`h=JOrx(Xiu*9;1=#5{SmH!r=ll}@xovI=>XZ0(DAJ-MFg_R|5`Vrv;`R}L5a3&TZ
z@PS=<E#soY@iRnQFl;(?YS8&FTiT^Ip>ERsZ1%~5-Etx`BrO6z{e|UfOHyPM*?hT9
zOtLp{(u5AFWJy1}#pV>V=HiUlZhkMkx9+_hk03Q2nl~EGWBod7-c36DC?_-9{WNKU
zv6ttx^7UEw6cxV{-_<gM{(dLR*K{~F<`4j6KY%GAq`Rw2R)4GzyuXC1q5Cl3Sac>r
zkJ5H8`dhfao(FGM{D-0UBzvJOsIviPG|Ab_m0>WUX#4sW3`lC1SPJQwq}<e1VSkM>
z$B_%B1o(616cnjJMuXYx=DGESmHXu1DD_<)xh*44L%=W{5A-Zx=^T^LwF=4P9Eil{
zO8MdS#oqhqz?|rfjv+m_S(s9ul<?dStfy)~Q_tG7=eFMKJnNn{2bxGI9seNL!BsC=
z$u#g|ZJC?Y?J{;|*&ehvx1_*>ZmYxe4!pz)B7*yjGSfsck~-D$d^zrZb)*r3^%#T|
z6YZ4q%w%X6u)=uv4~6_c8|)M&ODrARS9lW5q~47I%&K+VkNxhllAtB_1@<Iu(U_oO
zjw@LCWCwqh=@;l-Ni$oG40A(RXm=1Yu5!Wl*vIbWeL`3p*z0#@d)0eMpFCqIcC~vy
zGtUUJ%bjoUEnr@7Gav6?=<Y0m@LB7Ry6llCevb_h67Nx;t;HFtmrG^k|I_Smdr_{n
zpstzfl&cEFtl&+W$0C;3<~Bx|W8?wEIy<JFPd>iE0#W*Pv(eMx*Vyj;&*a<VqGWsb
zjN->UO0xf}q%b6gW2_QOv*V6sSVjQzkU377x}MblS^$;r4Mk%5OiApiW*sN#01g_t
zFxjB^%`h-aZ*FonNfo+(jsQ!3={*+uE7DgsBhV`Va|3meSaq}9pJZdz3_Jx|gM3Q>
zV7v<Uu~6ZhfH00te*aAM1icJv_Y5P#yxQG~@ha0^#UPpKxX}ws+Ywdo$&8k7>4-Ju
zzbmlK+<OK#<6qsS&y&)$q*WJC@7@ua$8euXIpR5g^Ze@xt;Mv<px!1v;xlwR8p`xS
z3Yi^=cXGmnOdjo!Q(uDoc>OzkIdh8*Hn&<f#r)^s1!h>A`h_oXDs`o5+C4aCD&GOt
zu|L%CNeuI`6j)3B7iuW)HD%2vJp7H%(vXsiv4(SPbXC>VtEN}d46rRpN{JR_g>Q&?
z*PJiC191L6`&B&0=b_iY8>S>5Wf(!scvkI#=htd=w|5>Lmw=aI1D^U@FEIh6;W;Kd
z8a2cKK8Vx$R9m~OzS0X)L=v_|>pwPSN6qG1)#bBtu<)POeMjsT2b2}i$bB0?x6z(o
zfrV{FZYj%w*GCHEu4PZt&z`Aryc*dcULQNxx=O(9BTg7Zf=9xGYsm!cW5$ePo$3qj
z+q~xK+i$q}kZ!KlooA=7ze51Mg{4ZqqrVWtTe45hMo1dwY7i+EuuzQj7S$a7S}%BH
z%cZW^`Xt9C)g{+MY|2Kg@Mtc_FKmvOfMDQT?Q`Uq900Y0;hOobFCsh4j5|ONG=1nm
z3>LHh)jf}`!KU@7-jwhICJ2!ikXct!wQO~dHqqqxLl1-x;<>*M>DOcT=jSLMv?XQH
zTL>?(u5<EzY!f?-g8$W(l80%R<Fai)Bv-{sL6+($^yTbBKBf61Z&qi`B#)#(K!A{c
z<N|TpVxroA745%*ec7@dj!@k-W9-kI^xtch?!_%Pz9DzH&)GR>wXCl>o2EK@Ob*Q@
zA~@ZFurC1xTM-|p!Os5kYJt5kM_8~N9Dj+yzylvCj*JE(_(yw)L-dq@`5EF2A{wrN
z>ePg8#zF7p?J6lu$HiAUzeYPbRmXb#XTbIsY7uz>A9Z^UW9>tY;qD~B*a0#pEZVo+
z#;|w&^#H&25)r?Av$HY3pR1cw1=c6n@w+@l;CAyQ*Ke;$uXUes;%HeXe!F0*tOTJ1
z{ThESB_zZ4?~8Y&i@(64vz@3O>E0MHqd&3|T&`q-t~9M<K963wb&2Ul)7tX8^k&<V
z*j`fpoeMnQt}>CW<JYX*N@Q`4W^ku?>XplQ%RwNKPI6<hP5-_waM2yf?2QUdPSn<s
zwGC%(&h!(>ZecHalg2%`*N2bF*hcgx4%G}ZfdC0$h7a=fewAJ_;#ic)rF^u(+wvWm
z1it@QEw7vY{}D{3OLQbH62SGEF*>!ATjUw%I2X282ReF1yyGgKGhSO|7}z=8uuj|M
zyS_u(hUFLfk;TwDCJ4<1Qfq?ePQe$B8*NhgjAB)x??yFiUqq?BV?B(*u~L%$_h<@L
z0P7p(*Fkt*#9?a0m=4I1+*wm;Ndd4gkN|+AGvwyrAL;&a=TZZdiSKyw4gDwy>az3&
zSss6H#@<Sq^J?C}#yx`?NPf*~dl@oG4Mb7`Ri0;0Fj0WLK7Or@`p3V@)IBoga<`OO
zfc)T_P0?vLWAR^2&-C`W>ct&$e2L^LYm3(_bY;HWOm8`3xNr`7pF+~MuMZ?vOI5aa
zodNf|xsA4^hbwaTpZGZeEPcUgM<)5bX?}x=TwYlGu{yL^5I~SEPV|*aG+Q|%3HkX-
zh5>VcuhC{UTY3-us3TT%hxfG>n)Lf3aHzSf;#yqqe?R2Be!dhNLPhqOUy_mHq3u>A
zW-Q;S6KVZ;MI5$>;n-$Y9c>*~f0+%-`K_T<Kq5;M0G`nJchc7io%XG}ZcdYLp8z*l
zu@k`iB?q+uCL2uu<+pSm+L(dce6HK;`~&w*Ov#582UEe<#C?xtI*-(exQbp@b3c>A
z`zQgvO7fDBUoL+zf$KAJxOU^QOZvU++)qF~lR#oN6-PDd79AE(vssz4@<RfH!<0c`
zl2Ex1>&i~h{SS>TuB*y)e=<GBa`#HSq7&xW==b{?oNC6nRKdb2KA(?KdH!EJtY1eu
zv7E-$|L>n0`~pY-2sEKyNmXN^q<j|?SXHTh25EBMpCR6F)&B7IZ5H*lMua`pjmN<*
z9~(Lc>Cw>QT=*`rk>wB9m6WZTWPs>W!h{Xp&y9E2ZX}YDpAZYwX8z+GT5c7M7lwM+
zJq!4oG#hU2)k0^{HCqjnwOYG?&ahT&x=A2%YoeZ!kRoo^tG{wQhgr~`o{f4g`e8B}
zW-5P!705p&=;=xYV7Q?ZroV-3KSFz|ij9&TuxX%C+9l5gFQ646!NEbP$0<ui#MVo8
zg6n#z;(viDpXd1;_TPZ3uFz_}Mj7au|E%>KWkKW#7;S$aho+WsJpXp?1lE9e44{Xa
zOWVIQ8_qkxqSoW()PQ5Bx(aGb1hh@r-67~>KUQ!S#lJ`SzR1WA4cs2lMdcuZoyjE=
z1w;z{2&9l|XYuw33^_Z?mt{AZiqX#{Kl~3n0zd+&a1;!wHiW{jwm&Xlda#pH>Cn#e
zUEN&{ddf+2*@#t)v#G}zDM@tTD<9D$c~S^LGnyUyw&r7>2@B=&D|H)142qS;0lK)_
zy}Egxt2Q5KGRW><&&&ndKt6?xwC(~>b{w^>cay{B`&4h!ENmZ!Y$PMel8QDKZvso7
z<J`aQ+QJI2&-ZsI@*eKBbe4kzn`(#6C54O#g0dLw-hr@mj>sp?2D&b5@Ae(X675TG
zkC@>`jB0b|y8HdHv;6id_bUh7<6ULycz1Tt_BG6VIbQGU{$Cjzusk0Qgi9N4`#e{v
zJ%O=-kaCWfs1-E{q=%&Z4pK-Hha`v6jEgR6$02dFN=mJWDMbjV;EiD|S8}s@**LmE
z>o-6f(_I`v&8<gD?d}wLkm*WrG*O=jl)uU2GE5UvbloA!4(y#>0;eK=fMjqWCUz!V
zgGUc!5uk8Df)zoGtG4;xWN4@~(5egTDFl%p@1kq4a&j<s1zAFQBKW^@PejN`njF4x
zuakJ9kpseTmOQOeVD;xMdmPR#8h5Es9ZGZI4r=&}@b@hHfb91Y&(S}sF`7FwQldJ`
zZv4-b>6qQ@3I*e0DNYKzWp3aOY1^&;owKbxpylTSJjkIbd=pd?^g=(qjfcQ{6I;S}
z53!8{?G3;9jdx&Y@$nKk1PeBYb!6`9S7~wYEIH{kifHQ0&S|XgEYZ-2$AWsJJp2K{
ziYP?LYrNUEwSqzD4#Qg}Icc%${hoeQv-7zG&_r8M`Zd@}B+_!BZMve%j4DfbG=ric
zl?-M0{ZY1F!;DIi6e~^w?}P+S3U8gK@2l&>UpNeJ0imL;bB}H`r*b&Pp!ef94`-XB
z23(CdzL3WrYEs3~sOYgFbF88_sYMM(W5c%mwCsQoL`u+-XI47Zbi%y{`h=e3vVq3{
zdL3te{Wk=6(N^xv{rF#l_csc}zpm|{H-HgRJ-H0{NchS-TT~T~_%JD_YdRC2%APRQ
zy<RC(m8>Ih1B9*WI@144@qc4OkPzYI(wrbP7xQvuwK2KJUH#p82b>CF$`k#ufUl;&
z%Hqst_m6l5H5H72@%AFfm+dnbk;nJSfaSNNBq1m15|BI~J$fp1_w>jUf!4CVS$p_E
zAMHK3YmNH~n!(|f!xM6QGBZr5f#MNgH+-v-Q5oIZ>^kumn?40*LJF`C;Ats1ZhJ}#
zTHIGjuj`wgzkqI%%Ia(_I)5%rp>ww2XfM+)PbfjL1{ws!J#~Tsje|J#eDu#3C~IRZ
z-Fl0$-uJt_fF$NzrSK_WfW1|1Ik<%6#t6tzm?BHE5M7U2wH)jE>&UL4;yUy1xT~X|
zcE1gqrco`Kl9`M^)rN9dju3KLOPhb*_dNZBpx*lX^&XTP8qB2qK|$lqi*x~J5%V7u
zrSzLZLhUOYI1)v@$?jK9Up;$?;gMuwt`G-*Z|iMN_uUOFz1pIL#F+l5L<-ynbTlQn
zra+p(E{+2Fs@7TGk4*E2q(Y#XG=!EJ(fI|?pd#N&CKjV+_dDc2M2f#ihvWC4^WU@x
zsTQyne3=l8<3c`nWQU+yr`xl4P0r^g8}UIDNEE*P%_K&Ul1unVd`AF?n@1F+Y<&Hj
z9C>v-1mZmk^URyfla~eR3hgcN+WP%sh7r%#C#@VJ+{quxFuxIK+TL(>*Fw2dT@<{W
zQ30#GGzVI&X=;Ub<Cn~)d_ZRl+*iYdv!xw|p$m`vmSfgk@Irtw1&Dp<t@T+Uq0{}r
zZt1waz%VYOXF51Cn8;MZ%{Ek%-5ApTBfHdU#)if#IAUOkxT`LkzbwYzE|Sc!p1X<m
z+F5SU52pVLJsd9eSN<;vimKX%?cbj%gElc2K9Txy&}ff~kO?DA0PIvAT(sbN(<hMl
z&23-hZT^g(yg0$w68GeMq7k}kiDqoZ-HPlKATUk=bg?}cHSzeBty1j|7iehsPc84`
zJ7pHmNBJa}6+FU~925iBqMaS<7?J+#9x@=$3c`~sA%g3ZE4rAWX|SbjpIQGm3t*kd
zlSj~aK&7m_c}Q#RASaFcyjnlTuR^!6gxwCzL@E6H^_Em<t1j<-yb+N(mJM4k%aK!@
zjain#t2A<Pa8Pj2*`Fb2-P%S>=rXdcI|d?B>1fz%EhA)ui;b^F1N>uph-a|$71anb
zP4HEn^*&X6h_9yLbCndrtUsAf$l^nK(DHEV3_Tq5Dz&n@z~k$mOVrm}7I9cCi8fup
zA~imTgZ!yxO|LcVWvcrfGR3ih8o0BC0RD*UAOLmPNe(Ph-GBhLwN8O{&uIS@e;WD~
z^R}HY^FCjy^_Y@?P96}DCp$6@<D%K|3}i@^(V9n5s8Zn1t&%BlicXlgwnv(Y8V)w7
z310l!jijt9S_VXRVxMpGO~8I+Le~kEIdX<%VgXf&FrR0eO~t4DX>I|C*q>(c%;NJN
zL54idOM*}DINLv;ox3uT{GS5`7mls?%oTC9GY`cF-C(~I&@wT6(azRsuK$$4Fi+!{
za1h7j#e?H{fRw5%sU(dEcP-uAXiFlx*N!i15>8K{!A7bD_k*Dv#~je1%9xI%A>%g5
z6SDG}0Bzd-ib#x1wRtT4N4z`Ib+~K~4r^^(>vf4LcFaEN!>P>e3t<-gsjdwYCoJBa
zY7b9@h+`Jgtsf??`bbBz>z3NSQopdW;|C#H&K5T#LtLJgxcA1lS$TTgDMBv8?HYmZ
zTY7`-*7?bJA@0m;`(Pxl9M|s5#R4EJC<`(51U5;eO6Xr!S>D7~{qq;Ww*HOMIt+l~
zi$S+FrV6F5qS!E8f&m6CsO|N<IsxX`X)7w!Bx0d~7ZGJV9eQEvI%GTV?D(V7;(H}*
zc56A3Vu{L1Bh8T^Ywx<5FkqNrH|uSTZ;s1)hR;1dhNc*)dD#c@KUwl2+{lKJ3uxM(
zahcN`^G|=g%m+&=BD<?UzkB;{y3&n=kU~~1=K`2})n!7$2<~l13{Jr$P3Ep612_%f
zR1o-@+_C)lhx1S$q<Amoytd8UzO6^DOmTS@FzVf!^=)x@{=Sw7#x-_$3|&d=99?|_
zy)jCACySHwXDl!<u%suYRGr!5ej+EMZ#mdxMwu5yn1Eomvi(Ntc5SBY-uJzM?m%ai
zw{fOXl4JnO)$k3M<i>N2GaCxDyodsE(%<}AJ#*OgR*nKk0m@k?f$s_Rxw(>6S2^mh
z<df8aqUQ;VO46aATa|MhKYliwh^*3ib5;FxHi?0RStA_!6zL`~b|=z3Ox*1wKBj29
zRF#nHIhzN#epTEt8N^!j;kd*r{cCT5GgDU}-7>XHnrOO3y*-=VrVBL)pMB7Vz&e`K
z-hxH7?<94;)*v03B^bP&+xt;z1`Y_87dc<?8Pt}Ef_v+G{2MdlQ%?l0D;#fDZy@a}
zFy&wGTHi^uuw}KzW%#lB*mc>bD=MjL;)}S2v^HyHVxS@=>E;gFQtf53H<^zg3B8mz
zhOs#bnNEv>T#{I!aFuubg>u~n3jp*f(f!IfvWGXO0KqTmZC0Il)QZxOX6yp6uEu=8
z>`-XJjJw#7L7BQ*-plmjA9r?3)?(d7O8%ItX`*B`;zitvYfo;f*WIeX$y{MMa#-7#
z(BF;u#qBcriJi|SBNFipEt;D^_kQUkG$9u?F0Qijm{@3MSdTm^+AgN7I`lNC|9QS9
zq}ZyFXJAMZ4nLeUv<OYv&{j*)z4;)`U9aY(G40whqXV;ve(cIxOPlI<u%MtVRy?Z_
zmA~Rnq#{Pj&dY<zv^j8RS5|~bR&5gGp&}gEESu-pm$YK)l4{eF_DqHo(mAcQ2h?7;
z-_%E}TH$n@po=WD=s63VT|np7WaW~66+&qNx7iILi@+rvf!F6&2Yg8a`N0D6b(J?=
zF6kbxABwr`;*N#DTg;8zVHEJu$-bC=Q&=SbJ<+}2>QgCP<qbeFE-8n=e5;)x)L6Fk
zdP{R%Hv4c58@KeY>B|_7XdB$I!jn{IPHoD4tr!K`dbq|T&f4l~NYpFlgA9-lv#f`6
zd^?GbOtZ6i=1zX$+t<N-jAHa3UlM=7=i7z~6~CPf=8k@(sBQE^9?xj?%R-H;rG8t|
z!2Fh=g+?|)g#8FD<tYhy+zfGRHx!vkgnbMgp<PMcQ;{iMSaAM=2QYFS^JsrZ7Jwho
zV!5$KtP@8?twBDRKhb+&Y3mg3f#mosltmXQH#|M~R%Bh9hS=&??%k0nwlnDdf@856
z2V{cr7-6RO4ov^v;gk%ZA=``@2yZOQ25&6WbuEs6%r^LY@GMwTsFR7y8I>nk?|c`q
zvwuJS+$Yd5nPHvm=m=u|owjZ^@pQ&NcmO1X&L?nlNuKx*aYs=dGOyGO{eORKv=(3Q
zH{$N;8iRx#y50n4(QwlE(&?om;9elQ*;Dj9%($ROqF7~mIiDbyF>3hw)h_yyhd*HS
z0ude{>QvdWZaVsRfIsDnXycktiTDe7iV4Xzudg?dd%Xs|hKKja*%ZJOZBIu^QZ_kj
znHDAiz3&d-^p}m|>@mmn3Q#nO`uG)^(cqBE6;rECishuW<HB+kRM{(cZXO};mHWb;
z>d|a{C|T6rWP$j%D-$2^3&e#|U6>6fkD66+(-A(_NEv(BWN<%LOdXpmQ}xY>yeL@y
zO1Cgm9NXu<=(|4ND;v0DCQ6O{AI9PjD?CJBNP-Maa6N#@Zd5%j?A_=0aYo+@9<@{p
zQeBj{cU;&r`%k?uM%Tgi=$Rvqfvkl(X58Jj5o~Cg%14Zwwfl8b@5FdK3v|@Kl^QBF
z37j}r%|KpIMBZCRjg<F&9Z(`AU>-K=O=jY7N3YBSmj4c1_^We6AU3{%@9zbQllfWu
zU^nYa?f(N@{o;o=Fes*VKZC#wcTAS_v@4R#Fzwh&qfU$h&22@PZ{C7~0x7pcySe7M
zra+udROS*{Q}D4iv*yaFM|+ROaHTe*yd57?VT1A&!`pewLEamSv+q4!GR#MbfD_`{
zx%M{AX`)4dWdiT#ir`r!&LX<Q7m(#WR7mr$)zC1?mw2?xT%K8XZHdnn(A7xMC4nic
z4lDiL_a_qm8C_io;K1V$zAmNw0wCRjL6JJC3fq-{r?CweM6~u9cY&$_;$K%~6^Nfk
zXn^>@^9(qM=pc~Z0`%GqZp;9d&5e01F7Wi-5+;wc!ijl>t=ms*-1hFx<O#lyI&qR^
zg_R+mF}nf0nUlf0HPFV2{o7*qv?iKp4dzolJ)doKo>!uetpr2q_I{r7A1s6y0i{5=
zLrQEMaBX6QaF0veqm%?cGTY6#7_eUok$p;bL9}b{BL90I3AG5n`0KPNRxbR?<@G&^
zQX5p;I|tOBlktkMgGeN4rp!Y~i^s+k0aw#Yovmeti(f-0mVQ!>snRJrvusH!VkFC?
zg;DpvM*C+)Qh^KS+h16svUc;zY`*S~U73pA=Y_8h_{QskuI3>J$JR#xmv6%NvjM??
zz*u9dv&$gxG3FBkC2%Esx2x1aE8QM`%kDU*L-Q|ou^z4FjYn!s9c6ivz$Z|Kq+w~T
ze?ARhcs~le^BKncujnnocF6FbL|??xmw%nPj36`8><pAs7)VS0tf7HtU`5~$*+2Q<
zN#hFAzV=k+^5`q71$3RP9_mh&*zxtKmE27YZ(3{q&o|w)@Nhjm8>2D#b;nAU6Sk0$
zr29og-anz(x0j{;1yWGp_()^2)3<-QCmgso>E28p+iy3riPUN~I@HmA)u$jUSniZi
zS-|>hPbIShb=AH1Q-^#MCbIy4@UOshy9gY7r$~`)qSrf$?FsQA|Jacxox+xVF9=nK
zGgTe$!Kij}b#<j!9-df^3=D%ueg)2<A@`=EDI)VP$}0->MV??>2EJB+JkfKQm+i_T
z(DB?n$o(+K>-uMC={b_i^dqW-(Os2>@Zt_pZcSv*YzgU@q%S1+DhZE3pvdU-$Bo7V
zLqS0lZ9~+Io7_T)ZQb+}Bhkt1D!d#+nH{^ytU`$34MB8VUv%XEBke82;^?+E;owaO
z9w5ObxVyWB;O-tgxYM}1y9ak|EI0%S!8N$MyTeyGbDsB{Z)X0@FRs3*-Cb4N)>``(
zrYIds&0Cz^m=?ioxBh5RRKg_^K|w)}yEDJ~yrTC|;$41kR$>rPPcFb1a}Q#_Ip-f{
z(@u#yrh|uhtw$^K>oZqfM(c7~XQ%6nMTOWW<wG(Wm0*E(Lg)&xq|DG97PA~*iWM+p
zspE^v(M*yIdbVFy`v*lQWlrp1wGFMy&Bj<wZa5mt7_2K@*7h@D(+jxsDyf?etX^Hd
z(RpU3rm|3)%6*g7#TUlT&OS#iAweKha72RCh2QP5-A7Zm84W~Bt5;{5H6=H{XHB*&
zgz=pWAYBt8#_q(i=du}^p~d;S{_9?VyA1YI=Bj&J@vKqW^Rr_zcz1nNc}&zFc-bVv
z(uXwA;l8A~AS!4@XejAezy66-s2@o3&F^SYowG0*$aLU3WFm@_Y;!8o(u<bPSayq+
z@Q?3>&xO6fx>GCK9bnyC$ElU<7|8QdRuedll5pk1(*iH)k@NPWWNX*A3;OQ)mv7(o
zj{bN%g*DN5UEKNo3}F(;g%{_ifgWRpzI*A9Nby}wM7YTA!s=1Y`1V@GHI<BJ9m{%}
zTfdaJ$4rMleq7yyA-i1&5~GHd@Z`##t=5!7^2s=6IRO-7CtfK=bC0z-CvbAwc9n`K
z0SqkujWWG@EiM*=l7Bpfyxc$xeo@q+`ozjIFR2Zh;h!nmfRHe1N(}+S*G1saO5)&<
zTJHd^OtBRz>Uk}TNsJ^<v&AYsi(*;=yq@W)i7QFw1STqd{7F}^yF%ecvK@f_qv<?x
zS5NY>>7<gEfrK9cCqF`18%Z4mHOm_0NI5&MCg}YwYakp;dsuZWn_uoD>&}`7;{IsX
z;+00zo3C_<*=Df0VbKHKlAAxn#3|(oF{~lvpIbX~;K|#RM_G1BOIXLIr;Xi+yJ`u0
z0xB<5VBh-<#t5zFky8T%Tt9e^!&zA#*Bdt77AIzf`OA1_qbnRXkEOY>D~HFnE1rhq
zKLPQdq$w8Bu^3g8AKEV9w@37;R5mRa>iE4_URo8--O~HrFL4TfO2yZW&B1VJMo5zn
zC6a;Wka3$lab4C|C``(x6RU;Rnf7-z4Q+A^(vT1>^S0mT(fbWd2aQL)1|L}@m<ht`
z+8BSe-HLB~a5ZgdL`?6jPufkSWgK&c_^9j9DSIXC{#?bP+!76K%*Hc*8=Y%JvFZ`6
zaI%XN)1=-i3Aj=e{i)4Xi2o!d#*1v-U;|?wJG*)5|K{m?Em$&7OlmOZR+-1~0mR?@
zDzt*R`)ImC&r36Unx=|+T5t%qsIJ_vkrZm`d<&LI$|ptJM%SqQ#+=3Ls8t1{r6?A~
z2j2OVM5F8%jV~aCH(O=b(y!zGR^dF}MDz0xdBEe=j@nUBDvN?ZwMs4HKC5Vk_Qi$z
zrhg#PaIDH&rBco7hu0;=GoT$Mz4-N)vQnBu5|zmi8^r9E1E3<eC+^ZJ1lDa2ii2Hj
z@*R@O0DtmF{7uHO-Fb(tqAALlsm|9Y>T6o{a#3ofBJ5*}&7EWO%^#|O*pfXp?XS5U
zPJI#{@XdRA-MX%c&X21=C8pFoj77=i;-{jd`)ABw@x=gfI%4w24DDWPwP4Cl%jHgS
z2TU-_>tw~eyO?JEZeAzO^NB$gxi-pBLN&3qR%iNi8H2QUVOax+_U|EJ;&J2!4xI?V
zkKVvKy;G^L63pWBp8mc*n$Ay&MWvERDB$+lhyG!t8z)^;>`%MPb~q?G<U=Q5<*hub
z<4!F&C+K8Qoym&}8~3N(n06$SS=@3B7u?3>3%8FAF<vy~@xH3rDwatK4u8+shZ+78
zV!F)&Fn`;&@;f8b>L<fZq(O5@RQ5(%tq1x84e2&WweW)A(WQ!WfnIE!(OrnrO#0Js
z7DgxQ*+QKKe-@YbPqqXyY-)$yU-BU+$F9FPDZ34w)}Oe0pt0<h0V)O?(p$$~&Zn4E
zjWom*R%=+3E89SGD*y^f*(!l&VO1bU-$?#Jvn9Fa>v`S9@?lF(Yg2E_{^~Tl7jDN*
ze!YOw=u4agZ*T7+_l5Aub#num{9_YS-K+D4Nj7Hrd%u;ao%x<s57UYVH@9I}qGO}F
zS$e4DPM;VQq7|SE3-Y$8C(poHp@jT(g045&?3Exfd03;LZasdtCzB23yMPL?V_sM^
zCZ%3iUi`g__T0%6Ma#}6e|^XP4u3?phIm!E($vYIv!D}OxX>rzTmbq`=UHiBXaIx6
zQz_<{MW^}2<7tao-g_hb&C~iI=U0d|?@b<XaBx1I;I-<e+8`HTdNq=gGwy>o2m2#^
z<ypTNaG0D}=5?hq%oC#<yegV|a4rD5p4Q#W@DfFmSpSGj%nV{QXR95n^r>%TyQqXB
zT@!V~<#{rma9e2whXfT8vR#J!y4r+DsWf_GSx!Tu%ms;sUN}xE7k>M%4aQI?oV3C1
z^+#DHa@i}DDYQ_u3wjc(Rxii0n2b^w+fEckfb`J{Ry}WxY4l6sg*D{5c23cnDZO9f
zu42wjM&q+6{i)rJ+;UuOUSr?^@q%;APq{d)Y)FBkb|3#}U!Ug>kjkY0K)5;nuKws0
zKUKF)`&Yc#z3)MQUjK*2#lf_#NKi!57PvmKx)6Rfp^8*&Go(SYJeuug3bn*w-3YcD
z1q?T5^(PT-#z#E%#&#k7fYWl+bFK43290VtIrM4Ov37~p$d5z-@0ZE;5eX-zuhSj|
zX{T^VEmsniXoz1QVnF!J!n+6e-jQGjWcV6Vny`0#+pm;#;B5YoSY0Bv@9?*t-w`8~
zdP`O|8bN{NohAE9r$>wg(hw^>UDe6X`r~bXr)l*?x%1<x1{)x!*3H5oGy2@zCbE6N
zW-_@;`psAob|>Fr%499<LDU;1W3oqo7vvLJYO=^s*KBu6m{;&H(RZ2r#<m|1Ut%re
zlT@9r>n9ZJg_>XrFXma=onTux!i3__66y^4+YCpT48Pm(Ow_A&Hd&-=T;#ec9ISNY
z)(6rHNajHDYP_H|QzNtJ5-SR4wU)jCnx?yaoo4$uej;}@ZE6<~q^K&%>bxuU80pPI
zCuV(U@2h>+7D2k%5^5&G5;=DAxo6rXrF?~>8DZf5-BVV$>|C{e@$VGIL8GI5$(zqB
zvyRwyCZ2Wz38Ro-mrf9^Jb85%=eP*A!IhMx&2+ONWX4{ylKiX~sZH~RRJQ0~!O7qw
zcZ$kq?Y$500(che*(~s7@e=wc)*>Jz;B2W7td}BGhg3T<5!a<=#QUr>$2QJUtq+a{
zJ&z_Uu48j(%~3mnSkQcCZ)w$rB!OTmj}h8p(li$_r$herslgZiorgMG=UHL!*?69;
z*}}sreEQQ2*O%U1MpVy`1=o{f#n|93SlRQ?COyL_EBk}x9Jm}7to?ULW!>k$VwqW=
z&z9A%rmm_rb1UTnR-b$==d5I=ie%78?t1Q7*|r)8^TP0%J@`~hl$2pDmay*dE49v1
zty~3-*Vp4gmrVJ%>__agmJIpXUI<D75|v_@&nM$4=2w*Z2}DR40eT0doDJwm$7qmZ
zS;8^sov$>{BIF*=m8d1|hjMJ|K181h%xgOdUzwi;Ud^}%{%lZwrrM8vY4JX$sno95
zVXMv`kS&0Dbg9SoN&@Yz!O7AFZW>iQbND*}WF+&~72P~{2K`dp<re3NU}UefjT#|D
zC`{8KNAK)@!BJ*$1;Rg_8Sjvg-Z*O#FV{Qrjy#<6eo5m&c0O5A$0j2F91veDBem*%
zEx6ERMv3fk$*-4LB9lP*67#YMiH7fF4-bD&i)AE?>-n9e1MpW~i@v0wUznh8<ha`@
zmv=XL2?xz+z-o4SaEJF@9e1rPU)@vYi`Bmj<+_TE53s7XtHGe>;k*c>ygYdkCYcI%
zdZp+Y@dyOKxu9Vi^m}n-HZ0+2v<e31T8HFj^P3Us36(OA?WpI(#EHkHAhgq4pAFzd
z=1S$fEQ`5k|G3(d7mr9uemq5VMA)>GgPi_}UmYQUSZ?#AWYefJ42;Pc;=ayvX4+CD
zqWRxNvXdn%Sf^_waFV^#Y%wJbdnjrzwH;#>c@LdULgak(l;v50nA_L80_-8D17{6x
z{!Lk##w^#6*R$SL(7^0-?MaHGU+)jbS>!rwfmkwBe?F@ZIDzn>DYP=-*=MKLQYE98
z=49^bk;GQQtnJz6%rTWUk3r!Ui%oAQYs0KGp6sF6UAnoKV<g)XHz-O4r~cK4QO&VV
z=Z0pzImb(HjqTAop&958AC~ye8_V8kQ0DlWdVt7aRbo-dh?Am7(X!CF`ijPod~(QA
zn!iqXmJLJO?>i(>%cftE77z+Fr|6X^s1A+Q+QB+n$iuD!WXMsM<Lht`e)W|N<&0Lt
zAt7Ckc9TsgK&!M;V<^m*L<zTG9;J*T3J5R{vzopsE~wy_P2#ECT1RDT0#pTp0AG?2
zc&t}IbbX{}HX@N-TMj)Fsm`wRVwJpPL!|FZB330up!s;eGcBMgz5MOV@s+xO_fd^#
zs02ZNt>lBn-lHvL=-S)w4NOR7OhkgsKB)SK8Xte3WNDXvO}p5zedou+ogp#$vJc*W
z%hlV~qFbCzhi{Wxn;+s%01f$LzuA|+IS{SD%rS<b`*j`LbUJu6lV_hPAsCSZkPL$k
zToir0z4%l1Wd^$9+-9b#+=5~tr^t(JZav<D*S+g;Py{BELf50m=vUFT)s}beThD95
zs_Y1Qgm>#J0YHsjs&#&PHS(kBKIb2;H4a8%gKl`Iq>%|$vtJYzPuyKd$P^lQGS9O7
z<_F)q^&aL#N|6$5>GZl(-)tdCd^o)D!Itu(TgbIm?6B29b62~1b`?}?A|$9}h67Du
z(Y6bbf5FN>rI1Huqnks_Dh^9Yi%nz63>a>4Hhp#;3Gh9s*j*W=siz3P@o@1zu~snM
zZi!xmOuQgta0OGoj6PZ#+Q=RuzwDSt^<xxe-C}GyRG#9~UeJFZn&wpB8lBqOG_SUr
zaePaB62Y}{pUP1sc_xA9DCRT!q4NEU<*OWBw&c_CnD66t{_y=U+>1@ioNJ}k3IdY8
zS(;sv@)P3I)BGc3;b65!lsG)irFW^$q}7In*<WqDt3#KCTf**>zWLr6^TuyZpHb8f
z71TzQr+t9oK<gc(?!NKE@zFH>@$$C2@pmRW@3of+)id9-Hggtoqo0}rY&J7=lZ~Eh
z<Qkx*8y`J_8(4r3LQ*NWG3HJeWcq$BHooF=a*o0NZ8E)~CF|a6Ng~IKuZL0~W!XQc
z8v$Dcy96d9Pt*~y{t^jiv^M9|D`kE}6nmE8(uFoSS2q|NSL>&=4&c&7Tcfo`#8D0h
zImH>xVISFc+nGk3@W>c`{Dy%)3u}n=ik?~SvMe#(EUs-iU4d-X-<jA4n`$TeAyA(&
zP(M{CAXhUu7(v8Te0Es>>*{jO{4_x_%t>Nu10?sYYFX?1Zm|_Kf9U!BIQkz9!_OnA
z?16tU+j0#kZO8me6X-PGE;w3d&<znY+WLtkvdZfz%c%eHe{&aLaA5;$m?@f{6$q1R
zvX<+Ph(S?scfO$<#e=M{l^gQS+Xm#{_`TKBi}}xcEZ7&O{owv(v}{Jv4ue1|PNys%
zRH0fU!9{)tTb)iR<&LZqv?AuB_`(S3m8ioH)##vM*kSWwIvs^osUijknT7W3w4W`z
z`B7lP(RLu|j^!2X?bYVJeZa;!thTVa0M@Q<q8>{b?C6npCO0r|k7}3Z9JLCb6*Q#&
zBulx3<8~BNKGB`F=}x0kW<gumwk^(f!J~XLs<=H%3S52|)pSGDaz5~E-!RGKI(hlj
zv*feMvibayE>3U@h}M8@tpI)A8cAXi_DLp~<I4-Qht*Wq{R36n57E^ru$XOrqALkP
z%pn@I0aD7=H;91}J6Us&-2PB-ebqwWjq++iWzp3pCK`CR{k%kVA2*PB+`8T-P81IO
z#`mQpiu%aT_L(De2toD(o6(nWAr*-?+F#i%Cj2P8&*MNY&Dg1~IcCS1l>SWb02bs?
z{#)e(27bWt^l+zcM$OK1tvJHhh-n0#q<QxG@a**y$GMFNpyF3JL8gb}=h}66szifg
zxf69zo5K-!qW<XemHyO56Ev8y$}Up>EP2X=kW;2u{2hrG_VI@|vOtlce4&2H=Opgj
zS&<hBAxDoKIL%aIbweMMe2b7VwyKX>WA7^XIl5<<a6ui8Zi=WqKGZJ~jq7`>4F~KF
zph?rWAwSRv6>p{>w)6Nt^mP?*!M?=$@#_G72tU;3;^&xWg=`&FESshScC>5wJkRhC
z^rhp0(@tzcrl^?T5umeTo7u7eSUu`r6pIp<8BwQDPv6n$P_(|9PpsljtDix`z&1MS
zzd2{)f|ZAXKYNs@;XuRYLk@zIa2ZBk4dwcQG=)|XXBOwBqPFm|)Edobr#t76Ie)me
z1Zvv}<%=yfi&m?;p3B~)x30F`wXTlgDH_I?<y9WTmlcS<;j^^>d-2+Wy{4H>cFY&j
zJOI>zJ!IEidhu}4eep0qnwnK|YIK@aG9f0Pe=G%JVRhPz;h$9pSr6b@673pZrT(V9
zJ?dCW?p*nx#!GAMmX@zNqN+{F4#T#*H&zzVdE;T~IePvXdEhRy61q6kx{`%gpB5oP
z35xo76)Km2l2QO$Xtrh9vTK4)p=W-UrtY%AA)Eij6yFb?@nf^;rH;0U)0&l#c&o2<
z)@C)y<u|a6mE}G&A9|>QFfLRO)2|obrX=^v20aptB3`F`GTO}EkSiQ|Y#~3j{U}$7
zdRr5mn>0LXu5K}OC_e*I(9{6^QSWXPQ!>lZVdxv?P^CyIYEXi+xjTnr%?H>{_rdO{
zNX>GUHNhFnX`JK1SamQ@;2lY?z(yBKpDY$P>5y%98ytWLn_^J(Rt$}Cox#1P(tU`8
zY>nybvYAqGqWh!o4T`;&5Wq$Q%q1m$xk0DLHC*A%(iIy^qDm={gDy&}^4{eO4B|1C
ztGo(SgVr<$Sk3otj<ushXDJv<$Zo!O^eikjW_d^(R2<G#hZW&KU#_LJ{$L9-xaef`
zStFJypBH<?n@#Pnqo8|2T0<hbqq{xfOa-|5Gy;==J4&H@J^khM<Lzm9Y!aynjkoKe
z(!7JJ&V!3!%kNdvHlI*@-6$`s49L-%5**i8<0*4k!o{Ed%fZgHViD1AjB3n<uP$_2
zE-%5ntA$z5usxn_Zis(=K01RN<t<VtcTKIqRve0wxs|+p*-9p~4mAyl7^MqL^R?H4
zWxJ~~a_Wq)17D|NT?N*1)#WvaO;!y$<P5Aq5k6=N=-;e%8(+nmgQ=T+rqmLBFKr#%
ztx!~g+fXIp+o{am9z0}v=3tbaVNHI=u~x&PEsh|;mCwJ&b;|5CCU@7SGk3bJw`lN5
zP)no+9N0{Vj`s52N_q-<U3>u4+_ImKBJ8Knyp-TEUGAiA4>)7tj{8W(IBlmC{i{EA
zFLnQ<_k;UxHCJ`k)WEENYw|*2wsG1xm5HDJG;XjJ&E2tzE(LfZ=E#xokV+WH#xj3=
zr(JhhU%U(kX2zc03uM>D`v$@*sB9X2vMmp`*)@}Iy=49SFT&(qH6mg8y%Da+H|q<X
z=;l$rP<q&DE;~#3iclsl#|_j8@;R5Eh)u2ynK?v4OTT7;4}VYBMY{+L+V5`jkKtAq
zI~?mPbmtgQUu@c*)N^mdFXhmylg!^g@iMMnw>UIPc3gXFxXYEJT*`5|o6`V;f6c&n
zTtw72n3w>=5cehdPmgK;Ehd2on?d(1cfI%UCe!2ZSZ1VlZlj93Im3;~JZBuOs{y`{
z*8+kspmnC|U@4-;BjIUXSY|CIpCZ`W{XWc_`VqPFuXOa*>p~nS{%kVh=*!sPDBSNe
z%aj;JTL9pSG!?DiIH9+HWMRT?w*Mm_631J(%S<+DGL=lQ|9ecragF%*fX!eHGln^6
zCwM$_=4<_^JrN3~As%|tsonG@<VZOb2Nfy??LA0~PVB*YNI10L`z#qmxkpQ-XG-Vc
z`GVGUAQ))gO6(O5_x_tTIgvSQ#Cm>tQ5RM@bN)(!O*_I_cGv092F3~k?6yNO=0LO^
zT1ksaN<PD8d-DjxM{Uk(<L*0fDK0({NR!)bF>j3W`RCX@*+R1)dkTIM9w4VickrhH
zH7bKicZKuH<Yut{55XmKsqEE&ZT(Mmyhrg~8TZv}0wtrW%N+8~-<$|)Oq&By@s*7o
zU+bMxV?{MYGh`3d!>pu)dWAj+kIM~ebMYe!_wrcvyVA8aeO12m?tz{dLjU@0MaJs<
zP1>KgWorCBD6=l{HS|f}J8@p+LY1O|BvLtYjJlC=t;Z#1n?+K^?V2LnKKSJtu6lAu
zYe9~Ov7w*0341E$#n$_c4J5}6zCQF!=-G@l6?Y>%ZwNvL$61UgP}A*1mFF4T*d={!
zr`sy&0RARkckeK^#$EEpqQKsWVjY(qplOhf=ZgRt3Vn)#^HYcKBwM{E3qj$k5`D1q
zL6aHq)H(Z2hv))7Tw_-o^IW<PwxRm;A&p~a57AK>TX7&1EB9C(ZafQ92rPBBKMrAE
z673~pv(8C*(Pd`o@x7PhqI~Ltan9P(n^Pl|k`Ap|SbIcI9d<N{CbYDRtFJWNs5s^6
z=sMPQ9ABBA{nEPI(g+B@0;K^iW~aUZtky2G6ODivaJCh#`U`qg=LB0uK08MwHL(eX
zjifr%qUMJ?t@CWn(>O!R=ux%wxB9R~1=1;te46Wv2~oVB8$d$qIU!@*nwg>pmTdf0
z`&cut@dcx3c6^}=g4^wj)>XnPDIeq;@kV6Ij4_Vhi-|e=ZdvChCPJz=r0vt<T-)VJ
zF~)dtk`MU`VG&i-vr(B$mEh|Zzkf>}uVMB0+$tfxqQUq3et{As_dH7(+2@SL?awXM
zmw{f5=0Qv(;Oi*#4bk>E%C$Argvr|c)#T5R-j!FG!1W0-_<HOj<o3G@JhsOHYJ9#u
z-sl?b4B3s4Nh7`YzBN&YZ`yB1%lYOb#q&Q(-|Y&29+>6JkxeJ@PRj9SqtnnknJe6l
z!+{cGYxh~*Z^E6I(1N&qobP}Y`KACX9ZRR_c*a{V)!6P(eHb=Y64Mzk&X{Vn`P}yN
zW%OicvqpkirQnmTbwiYARK^>eh=?OHYwX^o0YH|WySHKyjnt8>hxJB|gJP#>_}To)
zBLElag!%~*KzgM6t~@PZi4vBN*N_e{y6<QXd*ZpJ1jpT}_Ts_|w?q<KR=?>q(%~KM
zM>e#g12vmp(ji6^*WNvT)5rI<aJ^nYF7b(JtowtA1Xq6x@v8XagL{nrggh}ODsm={
zVEV}Y5=?-@8v`u0h>pCcgNgmDm}#Ayafq}85tOhMrG?6&&efYd*N}sjot7rM?8U>6
zhHndRAgYU3r|<PL?<EFVOirBbZH6k;uzhYlsOk?aUr!>)vuhkSOzi5%ovW=3Et52T
z$QWO4&gUhMJdi*5oPEVk&1C0qLed$V7g0tJ5Q-xW${x8<AD8jDT0u)cJEl9h96~#{
zdUp^Xr8dC-Cl-t+HqJk|;|pkQ)O%;rr6Z@BEs~v!IA*0$UN~xEy4*yv8~$9W3+0In
z?KD+Fu8gJx5F#X8oy@riR)Py?fd@C=78VM`!Ly{Y-`(qr6zx$i0;KRE8pP&$F2{dJ
z{R6^+Tm6H;WKKtBg5ol%!XUK3MyA?|-BpnbG%CadQ&A@IpK6@MuuFalP~G@WM`yxm
z=A_3+jMK_Wup$v}ZZdCz&MJN&b>Fyjp9}l4$ivRXjeO%E#8~KXHjbS+7Ga~=;Q#5P
zPelc_kaANrT1yrpGr0{y_Vnu!-^WGjV0v|-1o{6NTfh@OJeC_jkbu9qS!Opz`Z7M?
z%35;B!N*4s(EH9>Bp{A*m_JJN^1WY4m~X4E6=GiU>@Y@p=G-=olNNM2Ig<u-QlSNF
zy0sZ^!4e$OV+;Q=1Bkcf1JpczP`Q;dC&>cjx`N*6!ro+KnDe+Y{}-p^vEW&Io$;m^
zqr-+RQ4TA?UHXy94aDsGhcS#5>L*tLbv50~s`=kX7QC*qAw<w)RF<4<ljDS<#%D8T
zMDSoQ(+kB=xLFgQ=XE8b^bpu@+3guYDtEUn@-+;ZywX6-<7knP{ah?8`7Pa4W(8dr
zTl?|@pidnrjDC=2?OH>567j6Rdu-|vHctgnyeX+(GxlHkT2Rr09p{AH{S|$|1nq_=
zDu);fVZ*{Id>f>1Ey@sQcdtG`n1<aESIcEdF^HoVTug}NHyHi~J9DG2>E=UJg>mGb
zeRn5b^HZx+E!_`sr&sjlRq~rw!J(psFTl|%nkKrP+)Wl4+skhWD!XK^AQ-au8Yana
zOyD9|po7i)7Dj2CA;m8f{n{N_IgHLn*ZhU;=V!^byX(>fU@v(KTfVmKMfW?U0lih_
z1w2&Sdl$lv>Dsy5#GC$Jph?KzCNRb4_`ErW#s}8Jbue?TJGr*5{;gT)lgHaP5HKD;
zDiJK{A4yysbftP5$i3~9);x5f+;b6wKO1RX$L$0xvwYyMU8$QCRxMo!Ot-v4c}CGY
zt#Ulhs<5yU^x@y?WegOvIE>9U_Qv*zPqz&uWcv({)V<TVu)>4_36;E8xtT|Jh_Y&c
zA6_5+jCoP+F}CuT8`O8<DD~B3c@sBB(|-&f!q+$@z=SH=w{<mJ+oRfJSbm`*U341a
zDn975sISdN(#5IY`tg+>jFuirtT74?$&{MHW(f)zKb5^(spp|8i_{yqA4X?dV3r0k
zi@*}nN^gE6%0+*}hd8aqUo2z|3yO#-9+=)Zr76&O2G5!bxEnn*xn-Qs50pJ?f8d7W
z>RXKtdbYTEdRm`%5HKq_^(H(kSk&a6w2_5bNOv7pl*Jr-;}<)&BEmdajGi|^Aj7dv
zq*L-4(ZlCRtZXWm8lhlc&Nk*r4EC}U`<Wttq1}oWsrJ4k3RHg&>S4&6s?vLL%~d4Y
z`CPsIClSvtxeF(*(@?H`Qgm4;ikr-4>CVVyIe$zj`e<bFw_OhV!Ck~WW#GZJRf@6>
z3e&7>S4PD)gODz`T_kh^X<d*@tLZ@>QR%9GF?kHYYf{Q&_jyl=`di_a@X@)$8C8A!
zJFsYA*AOCo{ei^!tH|2R^W#Q7VOoEIahN6OL-+6WBT;iE|A1D7wKf(A^K0B8joasF
z`rmj&TNxdhBDH2D3ulmpwRhH)ud`{l5NcOJ%h&Ku_m|;%KQmHu5xBW8Maa=R+%DCa
zZ1VI`AXrkTM_O1If7`98BQk!kp_C{42x@J?cAdNm1IPUhxO5H^X!<Q*y<7m~A4z8M
z7^c>2+~i%s+(G{`M1j%B7YZf6S!^6EJ$)i<+rdbrbC%9`uKZCSaL5hJ(G*U?Y!XbM
z^rBgOzT>nWL2s(8bd<~C=~gtR{49I4|M2^0UnS;tFsKFv`L3?>H5Z7WC?<Rre~qqw
z(JrrLVkLUrr?OnE#UUwUB3<eU@$eA(^!3phM6^F~J(fTjLr%t}S5<i>^B0wY;WrRN
zB$X?4^^w!2t$0#Ka?7oudN1Zp;2vIERF)%e(w@(VN6>nRFFL$izcH(1L!k1oiB1sg
zBUhw?VKi0!&Sy3Ht;MlQo#I?S7SP!2grhFxynkTB3{foG?Zb*1|E@l(-m(5U=U6iL
z1~v0o$Yt1ha@`7QdF3TH+nCXyoBN^YrD%*$Zpkv%24()nIYxrMZ;bU`D+r7-e$b=;
zK|9}#^hh-w5be&9`L0~}g?5ZxrYa}+>1kuoyQs-#Io7=Cgl}U&p7>EIhuf>Co$8OH
zOa(gmhsUd)5FWOz(L*St1?`iS+!<F9>=_O=<MGDtqQrHQ$0*A){GFAC%l>zuKT6V4
z=x(zhgE4!$v!zy?AFG*WUIYt1U&Xo@U{fK=T`1#@ffHTGuj6%KEdlw(QLi@n-@6uz
z7OzzxKKkhHrg}zF_b;Mu!STo@qi{s4aQ1VD<Mn4kZxmZ~VfSk-E)>c?b!QNU3>YNt
z)(acVUe~kjwK;-w%vj$Z&)@*X?i)Dr%6tHD@^=ikpw|SxGfpytSWCc|T^!FDz#=<B
zQi61O+|~!c`rj?AnuCKS%@-_Rv7x_rGubWXW~+ifP7+@}wQ9-V(QqN0tZtO~^kVvv
ziocETmBdXq$I9!)JQ@6jcZ+|kCk1r*zwtQl{X&Ji-ol$APN>Bs3mIO>W|M!`5D6y#
zmJ55VunHnk%RX%B>%O1Uo11n`{t}(Ja5z78^TY2Em5&hYwSGc@3AbadTC=-2<>I~2
z$-8p0>jJ5O@Ft(^CeO}Ye|)PmaOQA2_Plgoksg-{4tBicTfEn{AVX{Arz2ec@Xic>
z`Ec<!8-X|Ir`_90@;{l{`}bmRik|-N4}YOI|N0Xs2%UPB5he(W5c{ilVoS<T)I3>>
z&RS@VNy~~XR)akYI$U)QBV1t>LrG_BVpf@7J$rAA`qM{&g-*C^TD9;_0@TZ;w0!rf
z%3Z{<mY|fwdZN4gl<?@=KAx%0I0UE=2_BbEH(}9ycH(1kVx~TKdtuFbN&oqMH;Fer
zf#h9UJqUpuv|~J+J#4VX3AXkQ{I1C#zjNm%k3?c~m+XFu2<cnINR2W$U0TFl))Gmm
zN3|P&Id<ck8smJKbu{KT?1KHuKXq}(GfLj=BSYZGc7Gyysq<s^&|Qoa?Ym+t*+mb8
z@n0CJ|LK~+NMBCFZU#OuZYQ}+1_s%a7IZkec@|$LG?EtAZK}%-7&nA}JYgoGy@S>I
zq26t?nw{`?72~b$>C9zFr#oSV*&t|QHqHHHcw+i|`;N`pbG_UdfT7m-U-3jAwB3w0
z#GXz6h<oqnaGo%Ubbv}AbsCK#{hz@>2fGvmTdZK2l;M~Obi2z9WM=5WYK+r@7j>HD
zz9@^D^L_^(*h;A-JNTm<MQ=P48ZU+T6Koe!9TIFu6>a1*9JUsxxH!N5uO_VbMN$9n
zO;#>sTL|+ppu68rqU8y;d(zS9CPdHRK~vY25g#Mtji~=;Xnzj(Z9QA}CS0mH?ujn7
z8iNshY$*-MFZMiMjaE3bkpHl7naBImO;*63M*&?sWj07dCJ(4fZDM`;l9@O;P=DZ7
zk(;In57j=PxTEHdzgHNs%fDk)^v}>Zdm>$nP&h1&24_FE2v2KwRBxB;hK2n7RQ=T6
zz<S*9Y8KP^tY^;iKz#P|V*~GlPNH7ezgrXdHQR5-=IGbJf4-rZpgG>%m7K3LDH03A
zn7oV@hy1AZVE$(kbg_zdH9pU<;sv-={I5wN^zy=9>TLDOB${Wp?m69TZ@oU3Ck|7l
zTx=QYUM!mt{=?OFvsU+F>sw`_K-56pU?Spri+m1>O0}NqP$oD3d~JztD@zi+HXjSJ
z`as@4GY!DH!TRm0i=&I%#G)wwJzy4u4#T7@SZb-i4C+T)zZy;(&o~#o1eRe>DBJlu
zcBj{u05q77v}$x;GP&XgT<$M-^WJ@&oXq4#;!l=L9)^Z<n3^f)G+%&lvlLj(*>Kf_
z5(x?{w}Tn$-l-0J|F7SL_oFQEcS>y0<WT_TKxh@{JymQ7gYFLzz}+;@AMP?1y&!>H
zT12%xIiG;{27_(*&y>^l5Hi3HQ}xT!X~A%MywMfm2Q@t25aiKoyGZf#s%h4nzF)y%
z)Js0{ymwG~d1|2s{F)cq+yM(Yw`s-p&v8$QoVF+c!5Afr&%Hm+R(|VuiuA%j1Wrmi
zXSF;M4nrZY>q&fqE&fjHa!_@<S8p(T^U()J!mpUhR+0DP-;I^XO@}|I6v@~R#gmgQ
zx4P!cR?L6KVbH;z`UdLTLsH2TGyIap14pmdrZf6o)BEl$?uz!~6T%$y(lFQS3z)pc
z*zmyP5NBH|fx=V|?!zXV)5((fLbE;IrsE>pO#VN^EEmM*3M#R<b#(oG?T-Z|PJBV~
z2Fhu*qn8u}2=fOJPx}$??F^?SS<Y5`-W}7=JDjss2tgSEQOxDCStuztSZ)J!zxNQ=
zQ(<&`pkT^iawAxhLMqPk%b!WB)ddT?!Zy51ugON0Mzt(75sO|+2=;b!Kt2LZ8&GQH
z#gly4=#%Eljv&oEU1`rD<a47!db8$ya|DMSAEQvIm840`uw!m4FZ8)esgO>$&77VP
z_|Xsy3K?Qm;D*G+BX){0Ddp;S?gScaS5>eP0kYkf53McHq~aH0v6)nHGgTV3&`PT-
zsQpGnl#nqOx+CZI>j)lpOO>y~%9B;Pk8t2=)&GHyzW3Y3gPQp)xO%H!tp^NH;Ka>h
zst8;7E=3=^UhOs-WX<hpnh%2zJveCeGgO#Xt)iG8j56eYFiox5JW7$S_*JLfBWq{0
zVYr+mmBU&q#UTDTD)(0qyxaEBwbJ%PzNAWtg5Cnef)}X<PVBMW`x%=We0N5I#i&Px
zMtcQ=%riVN(hTrFE*q>krJo04azcgL40~sVj^k>*TI+3QE7AZL3A(yi-`e4frqF0Y
zev)GYEfo4^eV<C;5N<kP4Tb)x#Sw=Jd_(6C2Wy`{!$BYt>OxdZT~AbNuwJ=3RXhgp
z_Dd}m8~FppVU}=~Fv<V3C%AQ>hbs9y{kZyA>Ycxn$RJ9QHi*yf8M`y`;CHgraXsy7
zKRzCJbt)KPJ{8PPvJ(dY322n7Ft&%X{t9_XJOUEc;z-_z%tUM@Dh(7^jMva!0xr|a
z4RaEIV-9w7-&oMANq&0}Hg>u?+2_r&ToMl0ZU*I|tDR{>_~=OG;?WuoUJ8@p)LF%o
zY~MF;6aE^#e^IQ^VD9^bODPrq$%xR5K-OU4SSr><rG~uAbyK2v-1F&<TJL=cvG+og
z?P~1|Bp%Hlx!ac8`^hcOy8jN3z04$>%H>FduOr04du!01V`TJ`Kbsww`$a{jXlQ>+
zu{VCC|7W4!1S*|O#UVRHsaah1!D^KYxg9gYYo+4<ERsT3lEnUA1<HkTqQ^Y9d8PV3
z-4x+-B7wGkJ$)sQ5!DL#oy|^1dnDOT<hg*>rqXxPzWpg?vb`tGu@28}=lCWe!-bBK
z$y`|VIXytS*5Y8shgg2eX5ySIgxaERYZ@RB55==1c=4}emOiW(>rW+*99rz4CLGK1
z7bzD@NxENXVrs`=vHfe=B!FgG4;Ew@P9+lbrke|4gO2I0o&%iee-Q|@geD^!E~3F|
zi2jNv$LhxH=vx83%nU?l6;x`w@|Jbo;=&$RGH3O-@JC(df;=ZWNgzRL3j%7&!Nx)<
zH+1LE!NE^+`Zy8uP1J1uY@RLBiBz972>3me>;gV=!S0hu(jhlmV8)a66RLEMLqspL
zsg-$XbbnBFzxTS>$`PFmnpOSJ25BB71pD}TwbM05sg8;Ntnyalay`@T-rr)=)OsIL
zen{Za?Gu3hCGa@S^1B*Q-=q>BnpUYcWJQSJvfrFU!YWfBt3q90%$ls{Xq9`WP^mIf
zy(Q(APoqIrEmzHX%4no0Xjh!SNHXCg>U`z!Vm|T0W&eg|z0w@)uuD%YTQ*ZMke(WN
zB%hKE$YcNBlo4k?d{9pQ#;v14$_N;1Fu3m&D8yl~pj;Ie0DHv*svkagU7fp=juvE3
zU+afc!_({Kn8`*?q=7;3mlOsGG=PnY5=94VC<<bMuiyGpYaCI{3TXw6ZbwBE@b>k9
z<(Q+q&(@$GX*z|rf2YJBjFXb#ayCY?c($MWxjToy|3#qKK7pO?lxozwg(vWPQ1lIx
zK4QANdGdF-fsVOx3{Gn;O5!~3up0vJ(K9?j&%0((ycp}sBV14YN7ifq1Dv=q@Xfb@
z?lG27lQ&OQBRv5Y)sp`;e_zl-6{c*=zYDs*5}+55$dDaJnDQv^R3rk%9}m_mV@_vX
zdIP!(ZHDyEX(kMP@&<5#H5&u}wbwoJP%L#sD)=w9PwlBS&^!I65<(5Yof`JX1B@<V
zkN-jkeHXo!za%n968yL-0zk~;WZ6%uW_}*s)%E*1eMtCT=|A%&QK_*r@G0c8C%+@-
zT=i)v(}_6pt!TlCI4oR!G@p8y3GDN&e6`N~h51T(P5iBCe>@8~bFR(Ll4`q~G@wy!
zgtl@#IS*t(0fb<)iew%#tMtwVggLCQOMw1Sgn<H8qJ<x8GYLn4*SZwLe36x{$44@n
zN*s5wHy+!}#-MKIoGlX!Z*;44q*f?@gqv3a+a(3Awt7@`p*=j~onWud!jUF2{gpr5
zYwl-KH&MHzner@9S15EgTdDFUeG>G`(W;Mzf5!F6a(0nSn$+R!^S~;NAUe;w$UDEw
z7(u#@8<)?m(XtNssx`5`YkGe=akY#<o8VhQheT1#C<7A;Xl`tHG|v$+7FQJrxz3}b
zQ8$_W^u;VAWWCju2+h&)Nw15NK;ZDdGLSPqva>*=_l%0lrWpKB@k;WYU;W1KcDhv`
zZiEMiYhak|fBSOa`m+t<82)f*SePya>wEaz9Xf4|dvn^1POUs6C;}MuK8VNTtn88e
zvj0dWZ)omY;hO;Yj=Ycxzk4F92HTZ3VHkK+OveLFL2pTE?3XWOf)D<#_EExua<9RF
zX#uH-b3eeRuN3ww=%}a6Yr98MtoE)}^bZW%TkGJ5*q$;x+@1>R9sox-NgVa3*O8~4
z$wiE)9vQMQ^^=D%9z*xOb0PL<8Ib^tZ-r&_paD<emC#z#*S3q|jNfAY6fpK%-Bq-}
zE?IQl7pF~r7H2Jzt3xFd+YfCUAi+&lyFv7m#u>Zp`C_22oP%psNEIfO&PEMzhp^dP
zjy^G82UASjG%h#W11D@&AeV7iGK{9`uQ#bTTk7wk*aE@EN(AraQ*#$_pbbo;>^(N{
z-V@!j+*z%*IL17G7wvd$;H{3$1RvsP-Ei4&1cEkWugaZ)NartM1W1O64~P{CK9hvs
z(*+~ZU(HptkHnI&HW(w@*(DMiij+DWTaGXMIpTJhnjk|!6k#)8w{_eD?A<pckrPhX
zzL~aL|EBoixlh_X>^bFO=F4ne&-!&(rdZB_DdQV=>E~J{CqPK<ODYxm_FJYo>>?<i
zo8x&Yq9~7uWJX<)FgL?o#d?mbmp|1%zb)yFWd}3mkg8hJs21^AO<*dG>fD>pjaJ^!
z#4{+AP|43$O&x1D0WyR<q!s$@4nZttzpzWHOo2qU>(cK{plU1HvG)uKP)5V{ui`Ys
z!L`#5G(W3Fn&29E8Cto^TT=hw{cIYDH1Q#$$=lECGxN>0RzvoG;y^KeSkh_8Vi!!5
zQ*{b_E#ng6!vq5IVT-Sj5vaex=GviGBAV$j*y0vy_U(X)@&VFr7P^_@`eY%}H?6FR
z^;1v4J4o_T6d}uW!(viH(e4tPN{st*%XzxRVK8PK>mMzEZ487usV%N1O0>13-TmZw
zE}7;<mm{f{5v{2@pO^Q-%X&Eb?6fJ03E0Q;Ut9C;!h3VT+nqkG>c-vNBz-YBIhNBF
zYf3wZKW7W$vVmt8N)%t)8CisQG&C^n?UUBHUID=}KbFORJ=x!@nn}>Q6<h5INZ1c0
zGIV(xLrq(hX0(7}EVLW4n-`aEi)YwK2g1}mYcUnsqvRsB^^bQD*EyGkmS;ic*3l%&
z&H#krF68e|vm+T0`(>I3=C1d6TE?)@7h5SymAAAN1V0X$8iI*C1M+=12WR8i7r4c0
za8_&{qfXXq-_vMiVvx(pP(~Ac&ksROCE<#uj3)XX*(P*0o7;inhp*VajDv`e%=R~D
znZSTDcNysz&SpRp82+z?;%~(QJw_<dvLHty6#f%aZ?KPDKtH|tS}Z!mFKGFbRDvSn
zitEP#xJxrchmf1o@9EA@rG}fyb%j`y=bF;iH=)66S`}g+7h1sx8AL0Idn+!3F_(>6
z<i8X1508j|^DdhU+sSa2TJGx-!vMsWQWt+;-6|t24*s?={};8PY<`@iYLzUnaz@@j
zbI<~}TeZbi7_o6K&{q!aWk+MFiQca!MOlSp?ar6*=Lsh>w#4+WX3WB&HY-JBm3p<)
zBwM^RRwDn&|NkjO08>!pUwD$D;S`2UpE9q4-LW*`&{QqJSL|R|;3u(pxKG+M%=6<I
zDR<80C0lgCu_SUjq=15caf+YAUFT`QbD_qiFj3U*cqyNVgp^~rz_kvZTlD}^7llP5
z^Xvi*NP<M+vfI)wRskoqP@PLb=F?f%n=0py5(YI3*SKU6qdC02n`tB#PktXgvfyP)
zIB##YIvFse@H=LT<+9hjr)qqzjU;u$XlM;rLvtIl1-5Bd9?G!VS?&nXXJhbr)_N8v
z6fpk@7XPcd1aw*Gn~)N3Y{gblaL}1#2Y8pE8+HMcq(;Mm<8fsq-AEqb{1{?KGrF-S
zjrI%wHadSP3_&@$oL(YF-C1>?cYWLla&)=~oO)eQ5pf5MPxgoR6DXwfLV8c}z(xq-
zVHo5Tk=u8*y+#X!D!TeZY?e)oRN^Z<xDC7)D|iHH|C!$ZS|$SC<hcOu*gO@vL4pnn
zu-|7Gnt#j%0oq_&zij8VpLv^XxrZD1XN0+50uCNIi;W70l<Kyq_YjEu0f}ygI~!W+
ze|T&E{jg$$u-U(E)Z=z9$Xq^2X|P7oS9)g)%$GOv8A%qj|6iK~zVkCfYvBC~6RFoQ
zqNX`<SaxOkp8@gjrCA8wEgLOVxGc^)`=m*){QvhX|9;6rCFlymJkw}2F#oLQ|I-#&
z-TihEp|A>aid!q^%7E$f-}n5lPiU5~fc&2>izy#zr^0RiJ5nfU2S&1PE+^3cacM3{
z%mmgbhuiwt%ac`HE${s=XkF<rjdRdz5&)FvwAIOHO@TS}Bk-!`veeVe<T}sa>2jX_
z-@Zl&A|jOUB3Zsziu1P=tB3@piyx+SD=mq~3|i{+p)}%|)cfZx_!UbK!*k2D67jh|
zO@D(JPD==#dQEru@H~`62@R=O<lVsS?P2*biLFicT^bI`YW~lA1`6q9fBq!5a`sf?
zY~z=rj{{6P+ZYtN|6}TreuPF5_PEX}XFGhD|IEQhAm>Kr3yua?|BZ+Lw_EomUBiP$
znX*wKa`F~@cG%>@ib+X*GUEFBZI#QSk}BxUaLe~FH4>gL%Nzt1|MZm5ulT~ez%Y!d
z&4G@V?Y_v52{y}Z!s^v}Dp&u0%pMRFjxa7CiAJd%mc$+n-hcOE&j&wPL`=nvPg1|e
z#+sg`i1^%u<g@t{g?S=R1L~Cjb}ycvMi@q+Cnt>%(?;)kBC)UtPmQgs$_EDWEut32
z;^Criz{VZiK%4h7)j2i}xVrXfZz4a$kmIxM>9m!ogwl#<kolnxUQa<a2LV_q>p|Ay
zxXi?`hmnW5o4?O>1W&bk#y7obUkm_E7XwT8=Y~6-PSw_`>1KEBzqv2DbT-SlYi+g<
ztL1DN48Us(nJkc&2fJ9`&Iaw!LdU)J1Ey5azU!!t&Q8U=1%Ui@T3^xxc!ZE&(RBl2
zVF^kbKczegeJV6+_iie+1CJT_(K{aDkg$qhIVzpsciv6nO&6FTXtiGu0cM~N$K9OU
zeJQKC0em>EF4y7tCzpwUMG}P<lMCrGz%W8Niotc9+}(fKYoLKf4-#5{lx6{?-?FLV
z<6^ssc&CfIxMFL<ljFBo)WWA;SL9x7mY_=QXU63p&dS~u)jCS7Wp)UH7_PAbqCi&H
z_`Xjb%?)*rx9N1e|2kuDc;5^&qic~jiBsPYu;BTc`aPW<%rF$kYMXiv#*XB1K9p=Y
z<ou38Zz=xy7R?*j)P>=YaEd=L8;$?M9Q9fO-?%4T;Lv;l_9l`}F8flc2$#fASw6Gp
zyR67cYI)B?PD?q!kUfvr)kbj{UY6Qo^6S;|oW9uLp9V~EViwX^Dn$&yXp@azi;0m1
z<uomZ8XajnC?Yw}mNMEgve0NoD=`!2fS8Lxw@&EdcbkILd)R?!LWk*yw_)h{ow<K=
z%JDgmAdhDCDxEw)G;Z?xFdK(lWZ949?@B@C?`!>7PQ_yM(X<7SureLia7w0pEF4nF
zC95d4pL^IDQuh6lNF&MX`Xt%v`Yq1o{_Xp9B43>gQLPZl6rebf?{hb>eo=_TkfI;&
zE<)xC@D3kta|CsVCJTNG-I0V52|`)Vw`HSTSbhzT)GTo;#n~d$EwMx7Xb2ajebp7A
zO{On$G|Qx2{fp1PNV2qh9)^H-)c~$uRsbi(ek$F7@rZH<bdUvs)hP<m!YP$xo=nRS
zptgphRqs$5IZ~(~Pf8A5IFww#UOqd~hvbK&0vMx+Z_^|fuKL`QDMc^8dy6Y?E&wRG
zih^Bi^DCd00%G+GJqUn=5HQBojV7$yU+Y=j{rr(a4^Wv*5-0z4c1G!(?(`&}g5zzf
zq}Hh@t?3I~+yDW}I~<*d%odBuQF@O({(y}oAiO*|*@-<!ijAA$dhpT?z8EDGfG`f8
z=OXvR(8f<uW}SLZY?x4CTGi(w0<Mw-1l&%5rS5X*!Ma4@Z?!E~e%_H(o-nP(!;L)z
z%<iY4@UvSRa-{wo>6f)83B|aLLVSOxKAIVe-J93F`k2*(3jmUwH_50{0E9cgx5m0<
zFvEr3i@)hS?UPR44$51E7%qR|v7KVdST%p@*yOz13d{GantVBC*}gONQ>(tq@Cm4F
z>A9iLDA6gjbUJ_H*6MIVFO<#+>ztqY8{YG|-sv9T=~=l$5v+cnE}c5ZH)cT6tP<v9
z-VMc~<)Gi?hQnSU!#mz^S4zX7!K~?PgLlLQO`vLG>K15FhY)9xsq66!tqP%a)ZVET
zZP>a8zf0R6ut@kMXw{gx)Pdg@O_0HH@yxvH%IdmUZ-w`_qG5B%`6%B{L)GI3s9*M~
zy^YyRnV%w19pUdeMZFVf_F1K6G@no|kfAp{y9>6}Y5LNU2Iv$O1E4r=x7m_o#)z0!
zSDS=Yyy1qr-C@y|OYGRgu8mKixyW58HIa^$*Kk!!MIg`H;-qpPQn>(IW|IuO`B%uP
zh~oE0(dH-L8hn)YF9d4My2Pv00MkCh%6HyR0{HjAI->~2l!_$TI;(3lJ#x#B6GJA_
zV#+#yNsNQm+KtEk9pX|{(fT@;vp+E9xg@zL{)h%gegD$-7JRy*yRKbtLxy|1&V=5`
z42Vgs$)a4u`Jb$IN?P+?=Y3q2FHoj?GiN=n^H8PN3S}}JFAKXLt@}9X!Ew0KXc7Qg
zw2l5Cedj0K6@y*bI-V!EGf{AETtINJF~DwIRPoe%?W+aZ7pXUuDa!G=OKxy?H{WYD
zrj}iBa@xJI?kIX;yUrN1SgEj>RC^WEgT?st8L)Iwk7$E=XZp1U@&O=cp7#ZO)Xr??
zHwVgXCOwG)q7(-+woF;pF5ybWQnX0Y0ORt}++QZ|>;>R>M*z}w((;6Yh|`#!H$1m)
zVUtC_KkLiirM^A;1R?6wf4n&|SYN^@Xzjc!OQp{dbnQ3Rhk@^u2Egh?8JyMiVNRqM
zwhO^}$BV)%0PlRxtp~~P<s^&O0hvkh$>1(m$hf-z{3!+xvk33oLu%>>1#_*p&z+Fw
zr!Fy+)sJl{8lJ6yM<0-fM~$q`@pka~r3RB4&qY^0$!f{{QJ!P?9I!1v)#1#%4HTj}
zWLOk~5p9)T1S((m!I^LApAS(xk`GiWzJ7c-99xxX1Q0bqrrj#nexJ2RlZ>mOU<-gs
zy*OM7Kw@rYj~y&3I^}12232POY0n+qqUd)+y6s#lttf#%M+ZS|D$x!`DlMDkY_jZk
zTMW;*+AiG&34ZjN=Z&9nK~CmYl5O`aAN8(rIdFt|v5{hAwIIdv0-ll`#(;%O5uukJ
z*;en50>_w_tChv-A)}Pvx!LExhJ0T001@jcp!63`j7$zUd_=;xGn}O_fndl6Gp0CO
zsmZW=*S}&0#Q|WxEB<hicOt#WE-1uwRENEZ7FY0O6(nHIoOQ%oLiIdNpp+NBdl5xC
z8RLrawDP5rSRyf>OFMO5tg8Er1Sd|P9piO5Lzx%IbX#IQaM*)z3u=3Cv05JuE}OF%
z?1Y*BM6}thaX4+;kIiq7@6U#9@X+~y{oHWJ`NQEp{%J+1X7uMJcWOhE<y@9`_Dd9>
z{7&}fJ#(k*%84Kk0sD^h%S#8bqtX*aHa|Gr$U#USt6)2Mk4T*OEl}>s`(}Q^X2Ckn
zsUKbFGEz20^8)1ykKp}FL!5pnL9ZgR(N-^@V>^an_|rMeo1U1BbK{WGBp(xxQdhk5
zkCx*lNr~$SZ$z$+h>8^?Io9z3AO^Fu<<$3(#7#+<9$1RG<puUF#8)}XrHU-jy0HXu
z63?cfm%g{o_RpJQ<ED-$n0P;l4u0PSw$dS@P1~&yTwG4k)ZtF{J@JF7hM)?!<Z=z&
z@Ul6}K@lep4`U%z3na{P9rp?%jw!X6I2^w;R?~#0*D;Uj7B`?oRQ&AI^D~T~x98^-
zK;)dRmXtmiuS>pLP%AOAu#qXWQfHj{-M%<+M)GVjsgmd9{uhH{xd_3HdNfbvyDh4E
zc1s%BjINo1qhk`<c7sMZM!?QEV-UrBS9uLEues9aAN`9+|39|AI;^UF>soNr-QCjN
z-QA(IbW4XI(zR)j2I&%!O?P)U2uO!?cgMFp=id9C_kQocJnPx4^~*Wu7;_BOw!rhU
zdWUx*D_%RAS(_HQ3_|PN!3g8uO<r%cruCkD^z<zPn(seEko2E3S$7SY|E!q%uKfE4
z7tm#OuH5PI8))grV#HNq5UhhRN9y3i(U_sTbqD3_o%RqdT;a5^ecHa1-@{FQ)zM+C
zP>}-#M3J$?XFIo(-EJxE`V%bl^w8=AP)rN}pFQpRctr*1H&u9TXh*AFawdoju$p6;
zezg9o<*&Uge{)rF`p5<9M0O_mI>$QRUucR^2gcjb<N7WZ`Enc5u39KfWb<ity|<}t
zS-)z}Ni|{=s)GU6o0g(yd9&AbM7F7}80g18w6M3fnP!?I&YcN$7h&~N6$8%m0-(2W
zsw`8VjuR<&qGjW2js^JJEIQK>_^iI&>j4}OGt5tiE^t;~<&k2^#J0NQndF-FI<lpa
zvuN<7dlw^!UfA}|_QLeL;MPcH?AQ8ZCJD}C>SKDY`_xc^E@25Kw2{}ji5-q`!A2gR
zJpf~1CSrjG?Y4FF{akukAL}~t+5_(O-WZ)4^L208i`y3Tm3n<e&t&%s91USVMU##1
z#)_YsUzis^CWLG`wiE8$Dl3gIc>O_`!cgIR!kPjv>3K>6t`An0n`?kR%ZUDjwW&ua
zSrL&X^jBZ2>j?BR1D*t%QypKbe{l>7I3L2NCzVm9G6Y0a7UL_`o#tzgx5GS;(8Rg3
z9R=LE<38^OlKH-;07Y$tKjfq|-(SAjG<oX`+Ue*g;yUOb1c?$U1*3E#lhEX|>4x4h
zaoLcAWIAKDZE<(cf`VW`R1N8MpWlJ9U;{=D8T_p#p2;L26iO<vmwRIKuA3M~9NzZR
z6;8HA?RP#L0TspzpSI4WLlH=o7)>hIqm2VIl6<~TTD3h&>y)&r&?qMTn86)|hj1l7
zA94BA-@sf*D!s4#0v_aMlF2&NVw<1mT14-&P`dGbUMHGWT21~82)eBE&NnN*Wk+*d
z-I7i-7S|6rIFrJk^A|a~GkENI>m0mkF`AVCbXHSa7F}3Ak^6LA62*BsR!=z6rb=&o
zP6QaDQDQdkC4r|PapV)xrEEjb%2sQkGot7dg5Wog;6UH>n*?utAq4Htb$?F~Q<vD{
zuO6by{_^V02KOtD2qNArCR2IX7u{O#@P_y6>98jA-l3<$N?DZD6i#@iL@oRkyid1J
zZ>E_vNCIqT4`*+%R`GP;N)69qt*0rZ@aWz}?NAkgyf~dkG^1cJ&R0D1S$*!>C#!Pi
z3p~Aa-}#@~?ar1G<<0c+gIwSbI(jp6F#21ck5aM=;BVZX7Pewmk<2M?X|Tys;WiA-
z0;<K<O^+c$S^5|Kf_bGfA@PrbVGpp#$eljpLW;LX@@WjwBUs9fPrFCYuQ?mgOr3Gf
zpJ+&vYM#}B@cnzN*x~oj2=%`br_o28#40^&F-v|J`SN`IT6aiinNKqR4&iwyJIYso
z-*~+D=+Myy-gj{D*9bgg0vl%+;v1!=L(uB@C6p*A6z$j*+k_+fr460(f{;1BICeJ|
zpty1tQTC)KEE2z=gH4wX@XdbVEVQh4xV;m*SONHjU!SHu&R2iV<x`$=!84gr%oyNj
za9!cSm7uoVuZAg;n#_6!jHZ#DZ^j>Ck!;CzXm+A!x!z{Z??FG{bzP2QnP^NxG-<C>
zY{}1%EKfmL31fM^LuyUP1k^dWH1gm>pU!uVr;B8A<eW_Y6t_t4S&T(&;C+aovxkWv
zSpk_(nqlXjF8%Sg*A{th;pG<`s=ngxhA~5N<WP+1hEK2&@;AIjz6>;}__IlhDdr=m
z<=|dq_%3dmf(|)(jIbg2H|rrn4F+kw?C+6qYsJItp(RGJC7ntF$+(#s&@bM+310P)
zeFTW$(96iTt^Hlt1J6Dcem87=Kzgn~Voh0zj+$U&Eo?Fft&I!+7#B^>Hw&4T+ZI!M
z12JoN1a<)bM+sb<+;{#JHncj;zYtjLQj0p=h*;Pv@+z^~I^6?pxF8>v5N-%tl$B5u
z&7MOX3Etm`t@!}bEb{5DsXGr6pB&tsA%r@(#?Npeh)gg?ZbN-UUmZutkg%C(klL<4
z%Xu}w;FsSCv)iA(@BE?hhk}+T0<At<BS^Q4F_4Fr4)xLTWc+zD5<!0;l}z{c5I=$O
zbf9}%@pe*@4cWVZeg1g97`Q|=WuM!h6#$8~iWEpgmq(QvMiH37@mT`YjxX42+>WOT
z<k0Gd@}qki!5vuIfc5OF6lgSBK-DFwsiwGp;Y#JaJ0JwQa3HqB{@O-X4WRgXC(2rO
z^`K$lv|tGf^5pq=F|Us-rlOq*f-XJ?cJ_}DnP|X1@4{_=fj@?WV)JN&&hz}$HZukC
z{D77qFZKFmBO%U|2caIpW617+$a3Q}sQL3&l^3^fZ2F*SXNixXMoQh)A9w}!hos7#
zkdrQGn_S{1k`*O+&FYW7fXXj-PJeee=vNS1WX*LLKBdiA5`Ocl%kS_~@}N^;e;WLg
zHi}ftZZ~{A^+%aS1771o=#=P4;-XHKu;N#_@Xt-)Q!iptkVgf5f=GUy@{h?~jPeT)
zni!_bP+6ngt-F&|Bwc=|AhW@m<d8v<MINMKK({@t0x4mWWbyf80i~k614=XHsrJkA
z4nuf*)dQ~X9=>a8IMGl%vusX>9bI=T7(IgA0Ng=_%j+HjroY&-Ho6sini+nHZ{Rvj
z2dlN6&dsyfxl})Vp}@Mu4D^$OZ)P-}#4GaxSD6o6!~;h-ki18CU`3D=_Me!X!dpUN
zF@T^JI~d#8Jx`?2McTmoRi|EwFji7&Oj<vfj!=G?;gpoa^PTrCl10q(d3!WneolMV
zyChP6d<2XzyS-aJjNZ54{r-qR9!MrHmD%Eb7x>8bJCtZ!n(d@&`q)69dV}?`l-DIu
zPAWzUdkuKgI_-;8QZ6@a+2v9xqbMTk77XK%@&Pl0(Wv+Ec6#k;PcBAlUL>Lu9V6G;
z0f?09eNPV_)F0dtV>t8*KN~RUmnnS7?-mTUdYIvrsVZKM<>(CY6V1!`oZs4Vs+oS1
z29_tO0R+my`5sieD;!zBJgIJ(%uIuC;Gci~I>BZkb?;iK{MG*%09Y{-;gM`g_)@<J
zE^onbod$kHtoglWQAG6EMyr&nqcng)eLb>=#pQDODeIlXH?nWO7UhJ;dw|SQSjk|Z
zk>${*;pB2ApE9Fri5i24`H%w22X7;D6ydTGmDh&I>me;UxYS)f6AJ;9=&<l>i?34X
zZl${Kkt5xO=Ot`$kfbVv1ig*3d-OU~NG8A%Vu93s3eTC!1n9Id-TwM`E9-!eaX6!n
zI1ikRP;hmTYDg!Yfo>GgXXng+7r%pk+h;6l_2Au8dtEImIE2xN<nl#6Rh=l%k_<p)
zA75EHn&Z+vep1KQ+h&+KkpFoA$aV04?dUDwg)7eBbp6pVZ@#f+abc<Ik(eI5WLt+E
z7)iSQu0b@_sB?*UR+fUgq1k*mO&`~U#~HAo(KI^WDgT*kD~j-@KF!RzK~^tx7%Ol@
zJkl@)Pd`^4+%B~A=v~Nt2s@D@&v<X%b+d7jnPL{$vA;i3JkT0;d~jtWEWLIoLyl<g
z7eYoF%EV+d9{9#PmE5gvXCMn+ApmW)Yt>S*gVHYHH76@X&yVle_N-T`BENW5Z*gF)
z9~!C;T@%9#bwk!n)VBYdDk<wYf>sh7GASUA;%yXc31a5_CU$Gm7uwEI9@V{5?H8*x
z`{^}ow7+zv*+Y1?tL#bwZrj(erf6ntF^y5@fcULjPQT;Wb2BctTl_mHkx@%6_>2PV
zJB$v}$@Zrzat+j<TbWhSUskz1$G+48y?6*~oDN-X?A6__4qUvJ9M&=4(a8K-9NEwy
zy8TAbmg2vZ;<~D}NbP5<PEo`^pB$6$;f!Lg=%;oQyl_p2^5>D}S(z;+0BS6QAe<8_
zN<d@&a9x@Mgpnu~VCTu<xP8N7nY;G-{&&5u>2vrEsbzX9BmlWQiFgeO>xV-ttQyZX
zMaE!T0{{Gb?A3&@Hy}$+%P-1$bsl?!bBMX?p~YCb4WFXhxtC$^;Nhl=q#zY19Bjhs
zpf2=);+7*KN+Z9^_Q5>qrE!Uc%M-{B(PS<LpELT4jHGp|+gTt;BzVHUO?*33=6$eb
zsQ{)sEMMm;>cyDZ_wQ!eCJkBqtgw3a-Q&cWg<AV_jhveg7iU&)dzS9-^`l2J&Pu&%
z<y_lR+I`RqJmwRjDzLjeu73`ip}zf${L5!0a24(lQ!P3PrGn6(XTb;KijR@qSmx=j
zAbXeH&z9FghZ>4X7>dpEXF6cFXncP<?FeIa+e4)N=EiHYxK$VpqY6XEZtcsBwGboq
zNS*$o=SpbrG!7{)JbF*%i>+g%=4<ceqEjK%WAAOlVSMOqdz$eT+9{o%;vI^I<Zs(t
zP*w!&M8&N`DP{k4&9P4v4%@%9hTUspJHh-y;<1_9th!2Uq_eC2y;{IsYpoL(6mO3A
zR>i}Q>}Lpqii4rDblO=vhmcdSCkEH#@q<u4@`DoPD{wu|+skwYZbuyRMM=UVZwfnU
z5K4kDKA82WM&(kBTqWbSrNNc9ixpN~7YT=cFqvr4I|jl3=GE8T(-lVoWAY|OrIcvZ
z3MlLQLuyQ6+yokH$j$LQOBvC(rRhq!%Bj4;^KDfGBLO=DXgqXlIr7s`u#+lA2aOQC
z?@yf;*X#kXtkKY040uKmdg)5a39<XGe_=?`svf)&dcpcO4mQOAg>USrNWb_DigMZ=
zxC`aAgpZCIILeM?#J6YS`Cj5ww@+em@2#v)G3gHhr~ClL*aso2pZ!Mir@Rdl#-ty^
z+q2u&ptO@1Avma!55WT`*NuydRQ-dL4DWZ4P3+9tQyIh!oKaF$!Q1r^igCds{R-t<
zcU<93&ke@b#Wa?`c_`?AXzwzj(+;j=O4uf@$G$y7#k_%@vBHRjUadL48PTw#t<n6l
z?c!JV`<?<#>5*PP@;xKObf{kCvVXtneCziKEzk>3sMhPNkZPpKvA41P1`-UfZk6h$
z1f$dgN7lqoem@@bHt*a$#YLcuAMM}##qxw~(d<rQf@Q<+)AY2rWDpV7bwi&iRLw>k
z`jXxR4JCXeQ5G)Wp${B)Y}K6P0;$tTE1;Yx6PE1rJ-sfe!=i%iTqYF__NIBQl=<9b
z5M(dHRI}#(`mH<sHlWJ~|069KK##-{#mEuU+(Tiq@c86FBOQqVMnis2<@AMFVGQ=L
zp7^O;t6U9;tg>i9fUB|GEm;!0Lhz@v*ZoMIxO1-*K|K>`4;MehzHR9^`4_hrbtF=d
zFpg|gro$|K0ScN_gts<_EPSqgn_sG??g4ZO9RVY(?%Q%4x-CikpSGH;BpZ+Ku%*#K
zQshF)%|VAcNH_ri$GRMN#O+pq>2G8xU<U-1>h85tvd0f4#`=d2_iw!HKZFi340w8I
z2Dwmd_R{kI3&%QrPn8pR>FV=vwedeJkbj_t65tM3TstQ7HEa97{%02%)NL@sf6%qR
za4{)nkg06x`o8sFzYrz@e_LhbaM`HWiuq3fD-R9&!vcxVap8Y>+5ZN{{%SuEYoI!n
z%6AVH>;o>;zy9*SkmCq3E(vll;?(4>!+zoafyV)e<f}iw4@GW^_y2))e|~Nf4gf#%
z$6J3g0vXajhUZ^n7WNA03W<63r55R*@BHrv19pSN66c>k^o0JVSIOXG8CY%fN&izd
zYP$4J1Nd~ZfY3ux3k>30!0=;lnb*j@m}ruAi$N=2W^~~X&f<C01i%yTs$)b8hrgs9
zFE>ga%rfNzr3lYbviAY3KA$(#tCV0qOn$2_q6GRz*4dhzo*{GR6)gAy-pEJuwVB)F
zcN7p^M$!M{<s`zzup<@>8m#3NzH;#cnt`ilFMwSZbjOw=-fmZ8H9*&9Rv4GC$)%*0
zKv3FEF9P%l0D-NeB=w8gOzYhW_C#JklP32q4r=A(3_Orw?v2RTwOVB-n9i%c(kFn%
zMv~eWO{CiQw0VXln^o_=o@A7x#tvXD>8giCkGF7Fhk^q|O?v-qbotlt224<)2jxY{
z5aKmkTnOB65352O+&s571E8a<VePkxhV4=9Frdpy<>mRpD(Ctd8UFAOM)oiGWTI4`
zx3IzeiN@``hdlz1Rb<Po6mWze-aXBIy8dRqaJ*dIO}+Z`M!5+Y0(Gna@B|9gyJ4qh
z7*h%qVntpT+YF<=Yju~@Ycdbm%yj^83HA6lgVw!Oy+Yu8mczgUPVFq{cP-|+U3uM)
z{G9I>z9y8W&tW|W5%SnDcRk%CwCDJExqoGFi6UYp1-KqTfbo#TVx3(M5Y{XD0z80X
zfO_<Y{KBBu!qppdB+HocB8_&unva-ds|KL7HUJlJ7bxxkU7{DM>}Hj-o`1s{oU?u`
zsRvUjPoT%)#1bjM`X*Pnxt_moA;+2V4>QVQATb0`5|jtzWtm4?qNh(mG}H=7`I&;x
z`OAWJsdj*7?f<vF*RY_~0gD)SX^UZP3P0ReFUBULnc#}qdVtj92A~c+D6xv%2RxLi
z43d#YD*q_KzYPS154775eXezc!}tccvM}~XrBzLJhob4AAO9Oi(E8<eAngCO##+^5
zUTQH`d15@1e`{>T*|54!6v;o_W@s*(KiC@E_hE)M5m4MzNM;K8SqcELe<Yizl~UzE
zCh#$$$}eAWN3!X+I<MyI%ve9nv=Q~L`BgqWeg}jltI*F@`?#k>-uQ7;oC;ko$I{D=
z2?biX^1!^<PC8z0y@(hy`YZh`SvCGJ(ZF4(kO|J2DVwe!5cYgb<**!6@bz_WfZ%+z
zol|R)68NJ$3E0`RmBD$B$`53ZuF1A>`vZ<1dmKzUc*rErmGHj-tLj`nXRnD7GMeew
zX&QAv9Cb?shv|J3M->~2xWISkz_Y&~9z&)^=O@CC`zx_pEcy~;(S#dQMSn<E|NCG9
z&TedIb%tL$WlML`6~Rv7FWd)Qi2DmV4GvU)m!<o0YpoxP@^x(A|8cFu_)b!j=y{HV
z4ORLvpW$*vusq^hHR6LIQJ~gssW_`fb{X^T<>2pkF+P>zfJQE6uGi5Izhce&A+8D|
z+K6oOTpQe7_)aW6Yt@B`muSzF?a`{o0$}Q>B%UG-(%&k+DAah|00qH&r1rJ@;0~nr
zoj)woXJP$mwrjFj0C=rESrVN1<UP3CVJ1Jk;2edf^IU!F@#ADQ@T~O6I>vS%h#r0V
zkw8G<&vN?I%SGfk--MD+vc!>2vTtMqZKckJn^4%4txz>P{KEw$SkQ!h{hzgN6>UJY
z@W<8u&(t!bW`*HrJ-Jo^-IgFit1}H&wMk5iP11TtLrGkgKimL7oYwtBYyAJXc}{@~
zcuLM{>}!xlRp0c4!K@mrbnmYMf<S<B#`~QV$%ouJue$ono(kN}$v2>QtTAiHkFYR1
zqFWUyg9DvQkqYg&+N7>xf@m<_-dGS>oyJzPjI{m2w8M6{(o55=`D2b-*&yajCnw|!
z0k(K`#6hOug;!|ub-kzPB!IYRpv+nqsid<Eh$tqNO6~5jrN`!@!0Vmc)g8nsk-dmH
ziMs9w-@3dWzBo*HPURkB3o>eRi*pLt<3G*3xOlg}^qcw~XmaK^x}GD0RFd{|)neWJ
zk;QW-K><u!6=Y+H3jkObmT(ln@7|QV)C#yP1Fb1$r5+1nS4uK!zcYBfnyi7Gp!?AK
zDx%PEbQwhy*!b(=VgQ$>JE8Sl3zYW;`sM`gX_1tgRRON_@2egC2pwozxC9zhPj{(~
zj><aB`FsOGn8J&OI~3_y&2PVr%v%GMvx+?zLyR_zLc%VGD13HeO^QUKCZ8SL-Y^^b
zODtDW^!?~@w*3st+-V{MQxmKO_1km8c9XZfew}$49-;AY*7C8$BE}IttapH(bRwgw
zFRm#W%)Hf<`Cx%TX;Yb=VT~VQV6hh_>NQwy6Py!J_xrW0ji7MDNe@Bi@S)q?l=K5V
z(zaC(We0VFsz8Oj4;4>kzeH~c(#|dg^vL{ixYtuopXc+T&HZ`x<YDNFI_N0|z`=(6
zQYL8gSKY1hcOt}sDZX$dxjM6T3CzS`1A$Qo&@V={H{ho8pUuhm=SXxX`Fv^x6fyJd
z=3UiQd7yZpZ3TEJ+;6&JXhFAue_YY1YzDL2BN|V5r?=r&5$62w+!Am}dPWEW3FxfK
zT3jwKt)}lafBFZReLP%H9f?%VJO{*<iB7zG+WOn4Zk_Z0DAa;F2?-6*hfK13&bo93
zd=KTm_&BUK$q&&25@OcglcWK|<Vqqafc|kJ9;)d?PD&HsS0X0%zAqXA*KsoF>{!;!
zigm<pPff15U8f}mXyPj|Rd+WBm`V<R^uvB|?I~3fA9Z=F{RTK!eEL;RB88TunN3#-
z4>7OY(s?27>&3MH`Rf0PoIc5{$^VR4IJ%>3*(uY1D!*lEKf4aCIlbZE2wg0k8^(NN
zyRk#o#MRQRZzWD1<md`8622qIj)QG#Sb=Lz0YLWhq?W*S{G5)<?<(Y+%atkQsMhcT
z(<mB#0rrjbv`A+-{B#RPi@Y|Ifu2*>rvX0iVn(ah6@B7rE8(4BOK*p^{36AO-(?@n
zF{QBA9{o(mbT+O&fG{7=dyuE=85MN0dRz(cIKni$JH#D$ofYz0!?5DMvs~T1kJgi0
zt8-PQ$e<$EcSKd=vD$v8OFqyezGVFQNaf~abqju#-P43BDRn4?S-ZCok?Zi61Txf)
z)2Mhf7Ssyc^B*7`<vp(@M5pUu5KG&>Q4#L*KRWOJGg?T{>edg8@PaFwB=krPY+i)=
zTofJndD^k~Pa&xvPIj0xfl|Z?^lO#p^`mbU%vjfNz+yg+zf8gp?Sh&178hSNJgH8%
zo1nNF-QQNz6E8o&9xYvG!+Qh>AP(I6zqV_=zlWbR?S3SDA{P7{)|Pe3-f2X1xtF?*
z`ObbK{bV?m#h^tjf!23_f&p%BCso}MlhUibYjR+HJnE?Zn`gtdKLw0u>iy^rb|j4I
zt*jZ;tGH1NC**}CZ<q)<{UFT_gfkM?bsJXEvAM57wb$9I_u-@$vlc|Wka%)qYvcaU
zosYUvwq%67CQYeT*~ZF3lx{=-c|GJOld-A;2p#D|hV|R8^_aHfkw^{Nr#mtQCq?0=
z4);Li{=WloAwT#YxfGWAk{T=&cCnhHCE~b;iGWsAz{n>hjnhM91&-f6M>w%{rhcb;
zr%^2~z6MZl45e>uU3yDsHXJ8de*4agvl*O&xK3(0c)Y2YJyBuQ<{dyD3{FM|G27oG
z119oKMV8$Azst=P%K@Q0?CFozXRQW;0_<}QDdnq&2lgk#i$R5QNef%|frPZsWz-ga
zj!ZRD)Dp%FC|y`d$2zBGy~3J+U%K-Y;W!%fY256|(uHgLmBQai$q#sJdW|nxNa6xN
zR&sU)9Gb~V49eMs${3ko_IzKjB)0a7K75kO$&I;n5;|IF3&DJ&B&X^5P`}>tkq|=N
z6=ckg!D{G@0F9UY*nH{DKTuh}_bY+pJa2-QtPLx98JwB|SQ&toh@@OWU5a1EGPs*{
zK0R?A5%nJvO%f}#3jH0p2RKRP$i+#Rhh(Dmt0dM^uEo6K`u*!zVQ-$|)!Ua3+(f6i
zw(|zC>g6V`0PP*xgac{%2B~Fq-adv5-4Jx~yyS@#%>S^~7egL=S{jQ8ij4fgeV|@)
zZBVQndVGkgp~xg4!Fdf<*3%fS%arWyDyjoWXy2eo>uN8GE44KK)QhCT;{jjsLVC}L
zM3Vu{fAb`T#^I$7zAukoL`RRzIb4HdM$Dp)&GgTAyyxLap6}k$JdHayvN~nF0@XcO
z4W4W~Jcm8aRpMmia%?fY#a&q?_VVlAAqCC7ZjgFBJ79Vnz0YGO6PDBF`rsEI`ZQm;
zDzHR@o-wYC!V7wuYN5TKDM_)R?`OCERZ!c&*P)ybg!wJJ_co#7zECUELX5FT<1nr^
zfY9)!i2ET~7QL&M1iFMOaMwUFjCqZVt})MUkEdaLR{-eA{3>F0dSlK|LXG&K59qK2
zHq(VW9id0`F-F7!ou4RA4a28c)v_L8Y{pbqr)x{Jz4r@&7PZrrYyG>06vZc7?ehCW
z-;K9$h72a18)HXBi!S3xilbVfPe^hH2GSLSD38LG&9EjO5gf!wuN~e3#I$4svL%Y{
z7z`kWSYIZb<r_Nlc?IBr_1=Jp_<;0cy<MJ5(rx;uXJSA|Jgnj^jA=3XE^S*JdABXI
zpElw-FWtv|H)1w7ha3aCtlk?**zbP-N;A7qfE2YGMb82P53qB{!$_CfLlpqj6=b6%
zRGBotpgC;578ZOw9>@sVB<8=EnDFS=0DM%X*!F+6wu9W$d2PRfW;m}#a6C4Io7m5S
z$&XeGP_A|#2!*|G)j;A>*|OxqQo3jnA7*W&0AJZRqPUb4*!6acN$ATyKoBqA@){JS
z-|ikF`Gv)(QeXyhz#3TNbGZAvHI^ofJhpWV!}}E4k-}<qk=V0z!6P64k+m+HY{q6n
z=^7$SF2KZdxqCs_yCMCmhhcXqU$ph+y5z;`glVm$A(>A|92x-^KKKg=-hrY42Jl~r
zz_ZD%f%#FhB}{jfe6FCMBOTd{&3b%%%+g7+@<@AV;p)mvk^4S%FLr5J*lL{r;b>(s
zlhb8$p^b<~Yxc*<LRmn*Vz{$z+PS7h#_#7xO^)MyiWh$|KuDfBiQXv0QZ;+P7UDG|
z)fd+dH;^)yEsGiiP*z<;!WgF<-N(=ZaNyA+qwSSAavY$uu-PL0n#61#7G_G!4ckS&
z(2_YV^OhOp15N^A8qNS2;-WZFKv_>7`qRydfoB=%S*w;hw6k~)3~i*{(gunr&F|hw
zRb_qm95TRPw1N;eaoxf31}_#xDQpI^7>pJ0tl(;?6vdV31||M8O*<OjrM6u<P6l)I
zc8L_*=F#`3%|r$eFbq<#$WuRpOjuI6dLpoNz?da=-q)S_<~1;mq;w0nncwHW7Y0Wg
z>q^VElf}Un3Mz;p&_PkJS%R{@+t#Nqvy+rzhH*nzY?_-#=Ei*_!8LR|c@rPK+>`)h
zq?MSNG56Q|a-;i6SO-qChmDYu`K3@CB1FgZKF#k)j2WLgnMa3<__2D}joLm1G}V-<
zmJ({_9oYGBCo{Ramo*Yccy&^m#Gkc!KAm3zsI{72ogP7;d>~NZ82WrFEWll;%11-Y
zIt1AN#xdxaJ#UW^1w&39xk@M$ysZN$H2}{;n~1@4N14?akpya0@rnrh_w_@0Qu)t7
z6~qFv7MpTiFc@E5*oMGuJ*9^or2$c@IXTA#>~`OMMKg;e+?e3B7^IoyB4!#9ib!H&
z+`4^RYbpHUN=92ZqD(wNYst_oja-aiUu(<icQlJ|u@EB`^MZTc(9A)OT*3R^50^4K
zSrDCf8}bQ#e_TBYQq;?`70B!0*P0i;w3h%(wHyzxHu2V`x-U5N`#jbZ2F4+95W2~$
zXz<Slcbno+`Sw)!Ho%I>PKPQ=GzHVQe-`pyBKkveLHmx%js-_#825tp!&s)^&r(UV
z{TCJ5v?xYRp02K=-J5PcZP6ruOf_hQ4ibch$#d=FFztQ_$j}m6r@VzipNCPil$kX{
zhwzZEzwG2!9s5v4E>jnCvrS1%O|lV<AJKK~@bM_w%@OYU^MHbm+P$&oATqoXSs~g5
zR6}6*6sOIjT%;}kEGyce_Q3nmLi+}N)6uKFgnl`n1}`2fY7&QqFI|TMsF6o;k`Lec
z$`?`j{jRwfE9cFLcD4s_C~d!VGd~82U?B1!!uhRe@AveQNzT_NsjdMveh7Ao8Shk0
z6@=_wHIWX3HT$Oa6Ed(`qaqUNm=SNt+EKPD+hqY#x25gk6rJQ~8f~JPEYkGqg=H8c
zV}qG#u3B74O~f1|)R^Rk;BDXV8;M>9ZhE|aVO9e!)!FZ8L+DD8p7brH>9bhJwvlz2
z^ho_}-RGrwAk&0bzWF(8Dw%u>RZ5$S2Ko_2NLnA{#&b#D(mu=YjAg|;SShEIukHaX
zPJIdW_ataEkI#e;&F@xG@f@!|v3F_DmKpXXs9yDUzcys~qWQv<D1v?t9h<Gh^5{Dd
zelPoH=j4EvlEr$`3l>q0;L1RWVoC_XMy*PKp-Q2eAt?$=IFSG5&T~Fj%@fBInbbQp
z5aQ8mMHpm0Ol%_LZ)T5TDZz=}9@_HnbOym;`uV)92)`{pQf9J(<@Y&nC=9G@YufUU
zB&w(~G99kdWpNpydY?u?@9n*b#gb|%{z$!f^Wwvp0Iyb6@~*s}b+5>x)x)Z6Z@bR4
z3MB-}lyN@26W!tD=0x^1xTFmuw#DZ_=0n$zXbU_`hUh`X!-!omn8W{*+Q2+#5g+LT
zowzs;$oU-ZMi%1OZnj7R2()kRd1`<Zo`0#ghiMAEsUdIv^l&C{s#;*AS%C8So<JWI
zUv!%5MJ)1)*Fo}B5SG429+P6b0>tDTcEaAm8<l~oF&H9>c6Wm)k0gDY23|7Pc7&Hu
zCWrTA>v<#!VmF<6J<xvjU=pSHuf<JX2LIjG<9*zWdy>CCx_>V_8{KPe$La7@#PEbo
zrE0-rX(UUHX3Lpk)mR=(ZJl;!+hU}xQBHN!@ch02z-tC;DV`#%kwv$OlG*IQ0?WPj
zaJDT@5uvI=<&Im04L80#rzS|Ww`)kZt`Z7{gPInF15`F#w+R#ju{-9hajWCud(qE_
zRgE;#X*9Q10bgy3xrjfNo^`%+vhSX)=UlthH`Fxq4ep8kN$-7rkatMfF}JDW%p&1s
z(GRAu3j6Hs3|aAm?*Kb$@8uZg7i&DkW(-yP%hxbnDWwzOB_3*I&br^dv9y)n0Ymcw
z7U7jbKyr3y6U5|6^VDT6A)3_Tiq+x4jqx(uVX%PS@Sf@&=xl)3;eEm?aXu5o4F+Ml
zp@$!11p3Ai^8U-Ls3`}E#Vtt`(p|l;=*EU#jWVzv6a6vSu+-)pI8m0hpvy_1==w_+
zJrW8lt`8S1=RRCGyaa&ihqBv9=nz@rAJL_CY|webZWmORSGPc>jNiSt2sb_;r1l}%
zN~o-bNNHOzzT44RKD1kQJHBrAxItymZ~JP#8lqW@-oO79<~ZRF31=sDiI-k}$~>O^
zhJ~?p7TV*m2}NJ+q%C_IV)J{ekSKWpp!!tBbXOtY9BpUx(9zesW|me1$!A={=8aA+
z>G^LumD{US@Dra7liJzue!LRK`@O5@S6Wi7^Suu~2M*a@WJ7FBy)d4p8^7Wt;}(J#
zc_2N&tkg1vB*iTM=tK^*=oJ#$kau6Vq7|vm5*F-ZpR+Sz)hP(R`_l8JIX;cpVLf1v
zvtsd)&)sU7^?1wRSM+;ngdP~EyRvf-mT6vGF%gz|<}X3Z89<4FI@FhV-KqlQ71J>d
zTY^R|3e90xzKJ0DW`h%?$d)DSs$u%XewIM%=!<G3M|B4mB~W>_w|hfXcR%3{j6HBf
zudPz#9LT*0F4byNpH89wYO??Uo&KG|xMXQUtoLqI?=12N-u4ei+PtWSPUJZHB`DQ}
z8G*?SJ<bB>HwahCru9vigSiO;@n#Dnw>5NQVr9SwK>LCYwob9XNLG{bP}|-(9@)*e
zcF(l3!^1q}Ui37N(T{k{sl5aR<CV}$X-U6_YAk;14bN{^Qf+&!KnCA|OSME%v&8@t
z_QX#nuKJR&zG4GhPuE_rce}^i;*fvm%OWRTTdI)sAFtBym5|A3kY%a)>)-Y`V^k*S
zR&T}M+9>u{Hb6zr!>VwBZOa!c8XJmCIr0#!m{j`Hn&%)<-t8_<x&RfPF4{=X5J^ah
z>7_rGBo1TQ%;Pf?wIw4D2^MBJR&`QrV}V>;yulNaBGW_XlUJspa&TlLoc<n`bNh1!
zcWaCea%R?doJ28X1Rw*5#jJkWx}n+~&3bzC`YBcYC1JLL@RbDd%F~)?@cGXc?3pm5
zHmt(M+cu)?(>8I9PE-T0YHk6lqt)hV4$6xYI8>1b>Y8_PDBiNs*HPmG++oB|zB+R=
zK7a2LCt7ILf$mk&^s}-<6{@*PhJd*k|DqziW<V~jp-m1wEU0x@OHKc5NT(eqS^uJG
zy6;zxd1ode%VL>=NX+u}CP+`mgHR*iooavOLGu21Se3tVhDnigU^8+nBLiWh!z8>e
zNokZ1&&ROQMV;nVl-aFPPlTnMHAOfHPq}V-a7tf5gK2A0gqEL^Y9&(=6@8C_bDSx4
zuK_9Rfm63(rCly{8XjiA$K8cUVDpX*8*iaYU*BIj>G64dqc+6WI+|*EuO)Qd_<Xkb
zqBbfJ&DZ%APnnQcp=m6cikBiB|NS|c>*J2$Sj6K^OBzR`e~-m>)AyiF3%T21e0QA(
zPLLI@tuSPfPPT=+3s&Ib+``Ml(aLt+R5s<ig+hnK+Mm{&r!k6PknPOkeQT!zD9os@
zdPnZ`sdvi0tjzZ0JF~3CwXY~~X1>MWVdSX`7Cg#me#GUlPo$fh!Wuz9ig+Br7;IR*
z-w#z!q<Cw&Q0Li7cLMV(nkf0=m?XV|gCNeB?pPM1UbrDoj)>}X3uNcC)u-{^k{#QI
zuD6Ka%xNgGxaWgIS&%(b(pK-;#Ow~y)t4(lz}YR{cn{DD>@!IbF&UH@xtw7v@AGlq
z%d6GMKzGuNi%A%(RsVaQ)u350{V7Xzn+<{sXMi30sS*T!EE4TEY^NVq>)lB`93|48
zKJUFSBA^y%;u;<7In0by>UI*Yr*<-^FOtd^S!y>?j|qR@?9NS7w8#JVr~Y-$I=zMd
zYB!?nn1QN~&~gu2t3u#)!087W3xjQclv-2~XBQX#<7qW$cIq`A+`VyFv?L3w5xfWs
z50RJecod!L{3@20HtnQ|R33(ijG6(k-lxfpKNJ`1?!`DVRUdBL_8xyhem0+2xn)(y
z$Go`mq2OO8m}B|YTQ&bWlvvaNP8=L^r;EOiijWINC;ra}|M;g)NYD=XaytM<mhz2H
z8qZT6NwUHY24tIMDCDQY#IXlG<*JcmWjjvz(crFTx&O7cO7xWgzspvV#m5P@<g*6X
z11-o+E=r$pfE(0v2Hg)fPfsuDy~D91!5Zf$8bdJkIbo4H!~UN@=<mbtuY4j0WJn3E
zy2L2+`C$9w<zj_n-YcOBM_%C#rRusWk35%LzynZr3|*JX<1YSAeT<i^Vh*m#AJ%G2
z0jNdhVipcfzjiOm5ViVo_ipfzNUMqR?g4HJ%8=IM0z4Bp6z!ZL=<zj~B?GIN$<u`l
zk@0Onk`*gUI#Dt5k+CNM{Cyu`8xY=YP&+6nXsw{wYD@iywQvC7O6Bzy5XOD6W_htW
zYcB`y7s$Np#X=1=pa{TRwPIP2@R3#v0h>iDY!;%|pFok4SCcNF{Glzo*ZTT$;6_kE
zTKK;{GO<HZY7Hkmjs;gM`9pOTpT~9qozsI4htzCptH((hUB1rF<zi=c7>=NV1svRj
zY$ohzvFE`-BH*2%{>k>jxBfbM6XM^2{L`;PJGk)E@k%R|;slevP;48)Wn7|PhlN_z
zI(TnX(IJuED9QKkOi?||8Ffr~81WWxiY(SWP^pS3WzYD!0aB>^w-&(1boAuCTdO_j
zE_Y)!*z>cq!hTiKVQ!#XJQWs*%ztSA&<hnfi|0hZ`aHBL@q61*4ZS>$|9p-NKH}1^
zom7RwZn+)6s{omjOs#Vc0VC8yE4RYzN~Mm)#q<;$2D0JO53c2yQ0DYN^7_wZ#tQB5
zdjSOk+!c91+FFkere0{tf)uXp$sBzil?u-i@_nP6#ilT;?sHN4{70OJ@VcA)V86<7
zxj${1)}}A9QUlhOeO89#y4$b#L-hU6!u|)yo0)IaNLGsO>;4^=cI+=-4`LHIbOQ0l
z(pA!Q)LC@DVMdd(C(^_aiAzVMe7g~SWaYM70Q){axBtwu$5U8Oh!@$LGf2MQTY3`K
zO`q9*b(dqb@aq1q`DG$r+V%Tf^Xu={;Zu3mX3Y9@>nW^;Um6@B)DL$#x!9~`mNtk7
z4%>`6iG5LoGJer_(fiyV2EBi%F|2Y;X6aP$@(7bAb@VtV<db@TF0dKyb04l*o1r~*
zEJu3Y$C_n)_dkOpwuJ7)C@mn&7~E#_$n?he?&BLEXv#mB>#`V3*{`Ky>JKXdo7$>E
z9^{gRLJIc*upB{wf7T_F+dhzP6YxyLlO|*z1^O3os0nG2$pnIdYnl~z=RR8hB3@Wq
zDqLp%kFC*KfN)~w@+d`G^>#tf!%Y}w^b?T2sYMH1<3Og1R3=*H->N0yvZRVzFuW_I
zq#l}>lzgB!5JOkqU?+4qW=v+qM&jDv5b8;iEcSDHA^oE+z+sqJ@>hoQzczNFzbmvu
zp&YBe(41vdP3v$lQXO9NY!~$+laB377T^ABf)>?GAxnOo2c1>ijiXE{(+cL0mH<9W
z_@ye8UM<wq>}tC`7Tvn|!_S_c(|6TYQIy4A(ZAD=1_9)pSsHMLOFjafVX6K2X=DBX
zK$ywrl8_1_mw;;jZcMb^Hv9gppG`h!dV>*l>%I;@r&a&^-~nE?Lban5+vXv~q<Irw
z-#UoXqEN+tKLUrK_Hi0U7yJF9Rqx?$F;@Q@kp;d*+Co-+U&g5zd!oI8_1EtzKQQOZ
ziEy4b0I(y?B5f=gATTKd)1%bAEYMW-aate{niNPPdbe72bQ<MG50_hkF}G496!rTs
z-6jYatwnzE9~EHND@bso?E^VnVA{(uShCLJ4{83_7-9m!heL9$V3YM+si6u`U(IhL
zL&4SFb%RLNA3Wj$4Y`q6J}7nb#Ms6Vd3#)|v^I5*ldL1mxhVWC`}DcDZ)3X0NaABZ
zx6gm&f#?IX{%}b~cQ!jv7p-#`a$zOM>vePZ#g(YuT2&3KUwbf=*7!RubnW~aFpvFi
zclRNfY0cw!>6?Uf7t;=<y6#+-kIhnc`vjQ#MXlu)WA>6(HA`oISLP7&SB)=cxvk;S
z`nh)HVt(DX|9!|OiY;L}<wKU$t`GOTG_Dg9J-r@gQMfLf12SxyIemC`X`9BKJK?U6
z^Vl;khm+Ud(@oZ4+qgE@jfJ>;1=<1ut_o+ZZ$6O$pI`DfWn$*z6)TnO9FvT95FD~{
zwZ?De(<?Q;I8S#Es#8BN2hHfcVuVa79Qs-2DvYy*oD<7$iUS$v9LyH`#M*8fct84-
zkR_ScJDYE3ahm15A(zxN=a$W@PPT6vz{g+}ahx?@sB(^uPQFyLL+>D*to|lzxX;A1
zFvIiTb8~wG|LOL@%4=&hu42q`I88R$53!vP<1MlF04J;!#T&ZCS~JB&mbJ2IDJvcD
z&@5j?8)pyk9C0BAE!;T{okCVPro05_yV6ei*`}N4FKrL!ZzG#MoVM)}DWw&<q=F(I
z&`&QfHwMZ35w4eZKDZV9;~@Q0;Soj%27@PTbLE<Mj>6}^x8Iv!1B4FUrQs77_cQ2_
zh_~ME>&GjV;mTXWmaV(GFR)OW1urQ33q^mDkAL02z&C{{y^3&qERgqslM;b=9V;0x
zCSS#WX9`;$@tKEiv)#cZyy<6kd)%e)Xk#J~!~&EaDMDd{-r*{&HNy8q?uZ*28n$2?
z_Ec}KuZ!<Z7g4FIsy6v7J_(aT%1;`Nbu*Dw!WtU=UfMLn51MtWVW+PSc=v$xtt|U8
zVooVjfSOt{IniO+C3Z8it&N@^O`fBk;Dqt{c6W>ZPqgri11JIBPcmlKJ{aZRvwB2W
z)UEXaRhvYAFLb#C8XO!tbcr-htDI0YvdM6)BAecbE4Q2DR=!4m4vUDlF~n&$x2Mii
zzQf5^gZ;GpNAs@!$t)jVyb)&StiXU$;D;ZYC799pXDN3Tii?19Tb!$GY!<^+wfUeN
zAbOeW?_cA#-bJlfZHWblNooyY(yB=P(W*oyfR>uqYxiY5TJaGZl8|t5vR38*G$@M{
zpV|<Ue!QcXoGV)<cdDS~w$&=oEa92DyGQ{_@$cRh$cfyEEHyYs);X?Hy+mD{Zw{*T
zM&PVjP`BPSyMUjcy&4r)ar|Dm-sMWjH+h_hC}#?&e!aN9j&F0>9H4AeyguZY0~9xT
znkc<|0K$v^{?B5{ae(6#%XIZo^6yHMAuBYyBFfWe_NfxhKNH=90HqTIC`76NsDCc-
zB9+jsF{Ry5dBMH%p-a1U_RTh(fm>5TiAbXDKQA9nunZBX3Gpo2L>lF$$$}d@&Izyr
zTs$@h5Y(fb+ds^eDQTAlM{2-^phe(7*1r&P4*}M~1$GbDt=^);5na(7QRQm66ZqvL
z{ya;{Yfy1?aYdshR>R5iU4Xx=2+I~QB5Nl>yrUV7U#^b?rIHv^z5#)20dfMaF~T=B
za3?+_Q@+i+vDju>00e_?Poz=y-gzjIUYJ?0CUCZNu?z9D?@$tB3AW(=!BS)7p{7%i
zgrqB>^4`Bzb&EU5@NBExu=$}F4+5+beGGpK4$t!fE~_z9Ks%u&ibO$I%)i}Ea?rmD
zDdm7kH*jyNkg?|Tl}zQ2Txg~bCMF?t%7jKupV;#b$1<B;%G6<z$RGg~H6fu!DNO+Z
z&l?MX${B*GL6$MbQl(kB4irFh=|vndv3ZTCbhZH_U0mrd&9fl8n!;*St21e`EYqwO
z2+VTlY*%xQNw+(xkyM`Sh3BkUvWl`F@aExHkF%wMZl`PNLz#ktv0IMNc<;N<w`>b}
z>eTTPF!0f?f!}Ag*yd5mjHtjTGLW)j0;DhtsTH*bi;FexD$em#Arlo&EA21-{opq-
zgY#8)sY%tyTn<Zafn6aFh{Ifc0rpXh&Zeq}sHm8|OZbsz2o^2YlhEEO<g58`H7;A9
z+fK9#8>GSmy-&zaFV<<x)-Sf1IaLx=g;aBM8w-hNm!pa5^_OB@w@11ZOnKbbRq19=
zB|~E>BmGRZq!{64mn7v@TKMM~GUAh&^%=2V_vtug+RoY~?jT=%nE63B7ccB(`79)z
z&T~X=mrv%@`?1WZJ*0oI?GzQHW%S!HS8pg$<PqXPvBdbu_>PXXGhyv;9;xeecQQff
znPh5Xqn8nZ6z3MT(_kg*jocT1K;@1qfnawWUCBI`wFV);f^htCr8P9;`s3j*`t`<-
z2M+oCPk#qi0do=laK+O1wN2}vD}kNRq6EtMwLylhN~fikm&1l10gX+i!<xH9EaI*7
zK5((dhVDwOUOqt&V*P-TNNHq5CZXFEj8I5yQQ^=%1=st{W_rO}D60m_0xALy8@}ON
zS1C~hHa2eqBN4PTzCu_nW^~(RR=FdCv#v@HBTS9`Vi-=3RNnW_qeei^H_w<_`D-H1
z72;GuK0A>QVKzQoLx<1JN~;&>##jf9V$D>CzB2Y8s0xuir4#cG68!*Z(6Sc?iB1wA
zVXIs^-?=no_#H37WGyu?9*M8_n)l6=%xxM{`r<m=spX*rNThODAkOzzfm46^b2un6
zXtPi$EOiFSZf0>g8jicz`}*2^x0^T3YXH<-n1=Rn7?Vv4r?rm}62}#i6ckD5?lgZS
z783C~3|(lJ>hZUU<_62-IiB=zAQ*FLRTvu%OQDR7r?BERL$c!<oajm`eo8nk7b@VG
zcpOGf(HwhT?Qey=rV(~}$@wXWrPSh|NwJHRi+U^K&&V_n9u~s?N-Noc4>=<i!1T_J
z3TJR_ZFEhUdVa!4klCe`Fo|t&9J@zEYp0>W*uHkt|Ia~2NcHr2*|Aj*xCsn7paD`*
z;Z$LyM(bzIUIk=Z{3WI69-|6xl`J7`rpU#*quk@=#j0NJOgenIPh8%&I_lnQ9FN=S
zrS!J5QJA(UA;&33eImk+^>jRHUy&O<FK`*Dt=`CB`$(YoBT>WRis<xJTOe6RTK}{-
zud4V+oZO9o^^7eIJA24tpjUOCkhPpyUX`>c3CU3VoHO9DJE4UAUMKP>dLBQBU4+gF
zkQJ`(nW5w-Ol;YO2jUkZG%}II14$y_dUEq*GDaBwk$c(+-D*4M>kK19hOXn3`-WD2
zgIZ~GZCX_AIwuTRM1+V1wPI=Ao4v%>YJ5&>Vc2G-uaY&C=)~CWDxKC5=j)zdpTIN-
zo0)=!n2ukAmW=sBJ`x2EV)cCJjzB)HNd7JI`?-Tq*sKpK4P89bW*T>*(hLJvzoEA~
z&z7#R;uF9tqoL`G$)p()r7_~LM2>&s{)vSIAq$SK5Nx;H6xmJk<E)W;3%#tnA~`7c
z<MFG*pt}orK9efA1U*;}D<6YK7v*F6V*<z(!`~6aX%mLp-0|E|%)u1{6!mF5M#u2O
z;d~^uFQ@IS66nU@4S71Bb6phnP<q@bJ|a4ke?^-_WpKJf3QH-IcCZf}joR)StV2d<
zliKGDgrxvy(xue(i0D*}Zc{4}yjg*toQ&L7WAD*>5hA#HDu_)VE3CVJATdH(+0z&M
zc@paYSzTRJGr^_^E*j8?y|Gd%oj-6u;&UcCQB`8UACAOEC<K;SMLfa!2Ga1&eDzKU
z0!L0d%usR~PL;3zoVbruhy<dxjU<~dT@#p`Wid;PfW@c{WMoEKxlyK9D}Em`MH=^$
zrEBq30;ilEoOmF!(q>0j>;W_t-M!k-dZ${EiiM&F0%i{$Y9Ca$M66GbcsB}>A-dW#
z`@FHGV}{wY)WfGfWNB=K9&|6%E#epSb~KoJ>&ZuAQos>uIkF4IF4_s!b#ZbYOih*m
z|GRIrV#&<Phu{Xw5Wnv>f4XS)uN#~W%7b<-SGRfj33vY%!1tVtpevqXU|{65OzD~d
z5lnOHTlW4^Eo^F7ZP*YFiGXl5?;LE3JsgPJr?i*fv4eShMA)YqXwpPyO>$)xbbe}l
zIZJ$4I&>HZh>T22q3kTS0hlP%I11SquaUO)?yrbuHJKkO?g@tKOWE}qM3%)2=y<^)
z=!;--RDwCPFy;f6p^kw=3Hz0pF&(yfC=0>}QX1M0JeFH9j?Zv%CS)@-teLY935oum
zBhj#7HGTe#Vscc{$iUeGKI{H(-+)$=t6m?st+sV<omKX4Iplt4T>dGqITG^?=yp!6
z*+2=*=$}N4IbJ2u4iKY-;Fw0iu<yx4@x+)(bS8@tgf8+zwo=vT^y?aw_J94bCGG|x
z2~hzDj~i7T$vF1;E3rw@&zB(4gMMlL{)U{jbc6d&{A9E4w;k5J0@=U?PmM}uNQNIt
zF?O#2)H|al)$QsglYN2p3)F2oO60}N3XDb{erOj0;R6x6Kg-)<4SELMstO%DlYpR-
z)0vX><OXw{Lxm&;h6t+n_6cv~Da-0~XpoYne}=leF3i)d7RXD?K{jkvb1-I?jQY4U
z#$1SIrL%^Md_WCJ_*F+OvkHT_iF0Gp(|><=7eQ2Cdf&(XTS(uGXCFV?$pq}h3yG_6
z+a7;mTDjgFoUT&B{L}&cA?AQ*te^H?64%mv9vmNf4+a*xlQ1~YmTp6B!lV+0N@t-H
zZ-_k6l`cmu&?FalL;#4k^^@BrUQ*rsT^yLzQk_}K@NP(+EXK3su@w%QW*>G-0Hx2o
z&2ALpvu<z|An0u4jMk5j0f$D7hgd+7+R@2voY!$G#?}XoB+>_c;QVy2x%D~fVkG+$
zZmzdPxJo)tv{GN{@R9v*VkKO$4zwq1`go(hcy_a#hOi)dP%a!0(lr>efuS7|%_v{3
zQfR}>ft8lko*h@)m<d{)MS&Rzym@6hhSFDdU3~R-ezi73k;6V!KK7@10!VU3;l(KQ
zYpe_3*h{$E!6zb^c`}%hDUh4yn{-Nk`(WM-22uzk>@z^GI?RjSG|5@Sd??W~J_kvG
z0Ak69HrrnWmMg|Oqjk~RO6PS{bfKq1RO_%qfQ0N4DPoAz2gM`Qn>N6tGxzs3s_~qT
z^Pwfc)%Dr^?5CY222X{W+p6hQWI0uu!seG$#TLdH2gp`&Q(>gt-B)OFVwa6&>dURF
zVWJc=3z!AWkT{&EWyK*QIS&+T6k=biiF6X%`k4`<o1=v)y45?_ZxZs@{rWIC5xtdS
zTv@ks9i_B1^CPJ+OL);$QB|taXFHkf&QRV;^<{0POPT1Y>mE&-#4OOCx`pryIcngJ
z!&nA&RkY}-kiQqFY3}H(<9oOmsy>n%`~)-^84pgYno5gdmLK}{h^<#za1OuQsLKc}
z8c@BUhec>i$koEme8ecZlvp|?kiS)^Nv?%MCF`6sm~;hW`m)*1Qqp&mL9kkFrrmYt
z7F{MjbPGAW;S8FC?X!o+Ojpj}8@4f0`^D~#^LG*DlL3Md1)ATB-SrFFO_R&yffh6?
z1(d2PtFL(L1!jy=C^iwuxG<QgHqIQd)ynn1vhNB`Gi7de-N~Zk+I}|f3`*x_@|vAx
zr$bO%Qo|*&nas<gi>kwnPFoDuN#PG~U?yT&*>>?-jOnw>2;vUJII*Y8(CH^g>v*|o
zpOnF=oRW-lr>T(ZMp;SLuVOS4f8cj9$Mx8&G%J$bM~!H@%SuC12m6ldj+>Z-_PSpm
zS|R4#5t|Xs#r!f-qLGqaJCC`wRT9xb>U&+uYj|+qCz8b~<W&|0qvfbSo;R6%MSG0G
z(H2X{O+VFOOi+jS5ak7{igfXDO{d(DWOrP&NQeGxR#?VyRm&(farajxj4I7&t<neS
za?R4xzY8D7D&$;TQf39qPc(m>*PpoI`QEyl(AQC`P1!Xf<g-A+#um8i5wsUDsS(4W
zk!;I2#UHNk-QCK7$Z&_^E%#Dv+!fK)x(F(sd36IoTxsLKp79o`Gax|PKl*=kon=&9
z+qSI}0tpfz0fI|#cPZT6-6`DN9RegkaQ7g=g1fsr1b26Lx3}1G&)N6x_j9#sRjZcH
zIs54S8_V8;Q)T{0Az!Wi6Jpuc6HZMF-Y-F^j?X71=;!~KWRCay&P7w*t<OEZ<m9mS
zCG(zhWvO-k6|(RRQ)entsNDkNzIof25;|$&VHtV#T|4_~00NE@F*^&NxyB!ZI*2G8
z)fCid%Dyoj{Y5=XyX8KtQygFdM-j=>uI*)Pw0UCmn>(PK)M8?xxEHFt=Nn`y9G_CY
zuHDm^ccg^~TnAE1Wl|E2?poi&l>ah6`0$#T;9lDvK3SZ|s<&+6C4tQCh^hg2TlTRx
zh6qQs<<GR{TLSsn^Mi|nb9yMqoSNCrC9QeWi{3QLxUR0Y3k*iNnwtCZucIxej>4Tm
zT|zu_TLV(OpLXN#pLTZsA<cjhA#4tvk_#7I&p-WaO@A+UGzi3db|2~(9WKwZ$qYyA
zS6-7!@U^1=p%`M0Y&cQtS?>#0J&dGnQy%th5~-vV{&Td9n7mZ#XT9Txh~K_Uo=@x)
z;PR9v3OCI^kLMrzOZ97|jI46+DsS0+m}QLV9!YB#S4js*x4&2Y?x|D(cOu_A#Di=u
zj+*{5ejy3@uoQfUtqU0SW`pMJRM++RwC2hK1gyS32^w&^%>894HY3Z!1E4vdj$te8
z2n3@I=fD+C2-s~QWUmaWnf6Rcy}*3x9acFXD;!?m=ED7aDTG{_uU3BD7x0k3lb?lE
zG9BvA{#j`}5Sh$UtReR9>M+hu!<()wg4FtTz2i9vwH8yrG)q$->cxA-bQ{|<$(TU?
zGt`a3oYYFYTYk31CDzdD;5ae?3<je(`Y*vj{}hb=P>*H^PBtb*S*Gqntt!0^VKE=?
zWzA-fq-<Y58~qls>jDx$8N-XqnQdv;v5#J9?=!|WDeM{I8d7GN0579*Kr_w*j8@$P
zm1_vKVs#jw>G9P58?ZDnG3lkND1hwBXz6~EuE>!}*V8r3llI$kNdBa0?ZhLKk}%y^
zsH%l>@HItla$q1?{FIgZeucW)>0KW>rE;DWABOMl#}b(NETMOI=7ZKux`QQh^+%UW
zuktmUXh?t84NEi-WzStE%N<)4kqOus<ttZYOq9rGlR(*N$Y$Y$GBRq+-y_~6J&fIr
z<A6mfqylh(CaFAQm0}|d>%tgcaQ~s4{jt&54Y|-=H6QEl@aV>RXjEVicCu#4QvF{3
zf}fTnGoLmm5x>|tCCqaKQZ<0&83RBZ0c2&S9G7~U?20wGMHui~30pgx@&UcPGf^!Y
z0v$2o`CP#bW*E$c9{~;@jPf!-`jyR0BHlf&8z<NHA<zqDVZS`P%CS1cQdpnMHYM%h
zS1G~CK*8F)8BF2=8IB|dbcf?gOYO&G({dk4y*@Yt$HiVa7Q~N7_&jFc{XTvo6lZtB
z4z1wd1h~Yxnaxe?@)d5ICcEuy3nDb80?+><=kqE;l*AB(4)`TIV=BJ~f+~`tf^m#8
zWR{DK(#4$K8G38-p66Te%JNvJclmu?fTp&y1H14GC?035_aG=tS=9Z423o1GIi^Gr
zOYi~Ziuf&D&RSYjvjYobH0$1l#OMwC!#%^sw`O{BL7T6hXX{<LC?9hToKKf4`ao59
zx`Re+4myaA`@a*EskH^+ldC?NpCf}|i4?Xhw#?!zjn@S|Tzw&7ev!+NDC$yPTX!^9
zldZ=IJNzYz{qu=MI&opvY#6$>pZ!@kQSIqm#+iF5BLcSg1ZK6aR}@R4Vr$!ji#M;}
z^f+m4+#hqQ&&6npgrrhQ^@y{l(XRj8&xDY!6+CbgO)9@l(%>dg`b5#$(ILQnx((>h
zafg-~EWPT9b>|y3fZ#w!=1JFdJ?c$vABW9AZgbksChhA)E6))p?9wsIYCLiiOp5!E
zCwZH%2=EK{ZjA7fICWzl7;7@;|6F4IqnP-CZzWcg#mJK}<0~qSa@32jsw3b^BgzS9
z^>9T}El(l2-r@L2iw(Z7<vnGoBS+X3$Xa!1UkRM)Jp=JH5bl>vLACN-)i&U4p;})?
zBzK-_pxbKRKZZu-+gew!2-<KOGeV#7H;O93?@zk`zi;&+F{U2`|H$GdoW(wKdJ<^E
zV#6Xmp;f6v5{muAwb}cLU(2mg<`Sz$SqM`{@gHaTj|~>++E{|ngDKG&!`{RB8k0Aq
z7!`5f3elAd)it8NNTJ^+XQR`1iVjX*XSOj}U!jQih&wb4TbB{A4g7qsLD5j^Gq?h<
zK(kIL<B1ep&RKqRb=9lXOwpv^REf6{5O3TSpU8tJ&6q!Y!!Db&!3S+1XfqbhfS1Hr
zyX(m&%@=}@?AI6sfbKM8aTY}A4X9pSQEdxLtn)T0poKB-JE!!Ca3Jmp`lQPRnw$8y
zDiIxYt=!ZR=>aA@@m!&3+E#)A+1MKM<Aft-yuV>_7!Dhm)zG<-6n$~rdJIU^w`{A3
zW8B!!3n_l*jl1(`!bbsW$Db9a9n)zFq)y+2b8J+@SEsm4AIQ`o;MSQ7G9#~3FV7Oz
zli}O!RJfLIMH$?*4L3bDN_cw9l}+G$M~GA2zaKDm+`B3!n|MK&W2Kx7{;~&HIDP71
zf9g4m*}J7oePlbP;TNk=l*S_u4uNF~n`cysZWcY!UozM~s_s6bkeq+mS=5$;6(91C
zbcVJqQf@I(H%|)U)9x7}g|OllfG}$3FX~QJ@5gbxs15V|9LL5d2bQ@uwFVq9pp6Hy
z*o;>ybSbfoT2GW_U<OO)D60VL_^p<cvj_uYY<%>KJ4Ob`53s$<%>-Nr|0y-dLX^Px
z{Qe!GLOYv4d5th&fbYaw4H>sFgA_892#9BNFe{=KU7j46+r>B<*vz?q`9=Qm1f0aQ
zQr0}gaxBfxr}Vi$Fa5B<X;};Fn5L)v$6>x~fGHtLvdyo}9Rn`)v@sy|<{tYO#G5|+
zIg9=4O%5V?HEmTT+HeX#k@0_jA*MB$<V5h(E?TJOy~00_<d4I0CRxb{s^nPa#%cJM
zF|yI+WuI$_=HdT12Y+s?bVDjeI;|(?3aI?wANE0$0j4%+Bbx62RU!VvH1={bK_uxx
zl~~K1IQ9R&(|pkum#w+XfBCSM+J`iz)v~Af4Y1SC-H;w0@(NK|eLFxshNcP#op1uP
zgSUXvZI{=q{J*ap&1*!ZEbYbQ0+k%d1LPCwsF*0gTMdIuQmNgic(&5^#_eq5JH;3Y
zN&T%Jz_l{|WVb&xgf^a$e7P1q7T;b1cB+uuxB1hZ%nMV?^V;#y>Dm34N;>3EsaN7<
zjKu7TDzN<+F*0+)S}E(I+*q73Z$0k|9_~k`TV%tR@Z?RN2*RXYv-^{(js!jLJXhnU
zCjbxJMUVD5xxP)DNhqH9k+r^&{0KLm$UdhErStLS>qmOq*P)5!qTNPE1<$zxzrdNw
z#Vm$-XyfM0m^a6ujy%QL{_dleE42c!0w$v?eyAY}^B&WaO1EyQ%@sB)<+IA$k{^Ex
z1Arlj2EuA%E;QajMrK4b-W{Nv-aTZ3zoKQ@eJU8weRPuzTW}>WRD{AjY14?@W1lyj
zD8%_hfoW8seiKW1vDxayGH{WO<njrIDCAfSC;tMUCyf`AX&0y7b~|Z&U@*Dl!w(Mo
zAQ~{IjEgM-rB)<`Qjq|1_k%ccPpFL>H-!gKCw-Zz-L;I*X5WQTeEW);Mca%`vb+e4
z>>T-+l!k4I<?>rpY<k&6Xp6nE18BQzxArfI`~WQt#&5AVe@uYw4jLZrfjJ|r5>QpW
zEHDAAjJp8DKJu;~Co0Wqq4vn8u^LvZNm*li4V@$am^~Vn%xtbtQE73Xns)6~VU`o$
z!G>ZmhfEcz<1UWtXE(RC-?5c8v+SR#?rLKFZT2`RL9!v7wmO%nZ#w|^0Oh7$^x|j{
zsV6+AJN-c5d*|sf@CpKg5on#%Txq_oY`XO{?)7s%XG#U)NIYFQviqmtF<aRrG4WjO
zFi`Fv1qSoTMa5>*okhgA^5e=lrsMvT4mT^@Y)9L8yh6e8IU9YRCa3MQ4nCjgMS+wC
z%y#RYR*f#4obqrAH@@Mwptvk-HUa4Sf%w6A{cgNWE?QdaIbec;!(JM2f<q%)TT8Zy
z?+Ry^{Kx!vJw`N5H=9xxsKh#KDQ;93O#BkbmB!8O{N6-HDg&SbszSoBxj*bKL>W@Z
z$=-!*NXpU5<#WnFlKk|Jqlq{lzqvgZ6o3NY(BxW;Hqv1LOfVT1m8PwQL&Icbd>J>B
zQDoYBf}VR++K0ajx+R=3Cxj6pSUxD>W;1xZuMAk~2wl|Z!{N--B;#_q8DPLspis;C
zGZ+j~=|eiZOR7-aCl9BE)&>;Qby&NmHbR*!FZ}?Lu22{qgL&)J>z%?|RI_;ov*PVf
zYv0aeR!pIN>q<mPPo#f#em6WLi8y||D#9|^z8acRGFbK~VzUo8YZ`emRN*gVzI%B7
za%-O>%#N4>_@IV#;Z<HHg^~TG`X$=6n(;-lu~TP62*n^NOmFp8OYIh1t9atMjtaRP
zk5BA9k}4&tAp&w)z<fPsj+XjxvFZmB@mUm$Tpzjwua4Us09&?PtQ@wZIf73;omlXC
z_3Ul;u(KM+aPFUJJoFK6eW`QG9-_b-FeKetWnV~1H8*=ze)XpPpIJpC(72LfHsO|d
z@%`@yJp*nl3l2AWy1kWe<1V`%#~sf|;47U~79vm!wBbN%@F1;+TKOhQwkLp(j3HEk
z?g~ardm)H!QckDOgRF&J@fpE(2TeO{ZjmhA89+dz7-mB<EiK51R%Y5dV7!t!Q*Qx>
zq}Jb)C$Rb15L>BaG0@+OLpG+z>Yz9osL(4f;K~=dN$r%BwEzxgWWiB5aXhNWHi3<W
z+3}yO*Y^g{u{0_Gf1`o2-z3}2aR+dCeV7Yi2)Y7Zx~GCOTxLr-jG_1EXzW9<HdRUR
z*+sx3DX-(dLKeh?ay!!UkO(BahT?|IW2n?%ef1vFWbS)ii<WmtZ0mgZFkp}^(Z`9Z
z3-uc#Xm1uE3U8Kby+Q%7=wRH9{l!L^<@I%vV{%~Zl5Ey^h3{P5y}MngY}WJrr48)r
zGIr%;j)1dzokd0$T=(eZ0I#GsT^P{QBl_L*yUhx-p|=cWWrpjR{fU&c$J4oh0SV?F
zr@omm8u_^C(!Z8s+DK)!j*;{`(!6);^hW$t+REj4jsPOSo5I@!&*;HQ?@t$h*qp?u
z2wO15NhPXt-)12;KqMq{O6a6}E?%=MKjSL9=xWKmDblJop-H@F(5fcOd3@(Vtlwil
zR;s3<Ua5o1<NeI65`74){`zW_Ed<Cdm+sgBWQZop^<3j}ktboEMwz%J5Pa843~Up8
zllmGF5m6#p7W42jndY<T5j|B;X>pHC#22kmjWLiPPh20tz-40U2;ig7HLJp;OXEm+
zPe=ZPbM)KN?o!gxVw3qUG8TG3jkA3J4-k*xnpnW>I4QIrBKN(z=1L@bsoc0zrOpu(
zCbvUi3Y=2{)s+ky*~kxSp}EnDt&nfF)+>BE`*R_7l6E>+%4Y7%MLq)la!>qS)XPQo
z+tLc0;V${2B5tq_e+5CFEFnq+Lzuw+OFGw98op?LBeT?va_3GKIQNL~4}0Evm*q;+
zqx3wfT|L3H;Gp-Wzq8=0fZ&|A-O&ed%&Okge%kmZ)LYu?4q@p?G_r{vxan!0N3r88
zJW=?h>PR$~33^D{vE?UDbt+qdW;{Mm9!v`qpgbPP2$ArRr&Nhycol9VCameuQR>v`
zhAsuZ<XCLpo|&AUZI%APNpe(MTF!R@;Tav<6@KrOS<_IdBeaTMWil^RIR57DIt!Q^
z{$2&rJ&x-Xm0m+Ug(pnN#BM-;gNb@ML(IEH-qZ~W$)TBk%gTUbyqM)HYO_&*!t%??
z4^^)VlcBU_0^@GcdxsG#16S9O;zQxg8y?qyq)F-?WK;dwGgXSQ<2Nyfh|7oK*3F}$
zG0jNWED$~f3Z<gxp*NcxX5bc1&-+c%m^kV~`j4u^=bxx3P}}3+DaVeV?}47t<9)0t
zS}k=vs<v2V5OtOVZ}&#?$UWPUeQKNI2GJPwZk+9C)vNX?rk?pZpU9D)bqen3$w5zw
zzchnmcN`{aR7A{_OHx#IE6#`r3Xg^pe!{yC>O2Z*9?vOB<ca-Ym}t;2mjj1-4W+?t
z4+T!BJUg=|24`B-xUEaAK0ijhK1-pxb!VAe=}R8l%oofv_k4x>PG{;TACw&XM^c3B
zkG{3n1MxI3+(-biA^vkFal|=$nWGTJ8CcYId}8n05GJp#oY#keyJES@Z)Kbe@4%w-
zQK&T`w~sGh%n?&c{Ge8Cf?H*&E)@ne){#R043Il5+Y^=zqFM)EMc28|uvZp-%9b)7
zNn%75_PZ(`A_H+Ba*>8=RK~;PFF#)wZ8kv3F#e_D%0keh`H*fX2RXc~&FAMIsh>Z1
z?~0~0p|i42*S|l?0@i}rdc*^2K`Z>t!HWd+6$m~Yixb~7H@%<yxZT6Y%0B%RzpR(v
z+W9sx8eExD=pDn0{qf}NA_s|$Qhva0k-V-3k(pxFCyGc~xWMUIDq!R&G#0!{v)@-d
znIPHUDh{isb*e?veza&Tje{mZM`d13#M405;p-MnZBc4QDwU*3HCoz^aR@ZZK%_Jt
zAhJJg4R;@Ju+ViBLLE#L)|#8#Hf*wzmr$n3;B6C!1!)Sb7&Yn73s<lFK!SQ_weVr0
z&TSJ(DveY4YIO>h(nWHENyBi}AKu(WAl0Db@?v*Xxp;i^QsY`FVKE%JV$I_#DM8Tr
zF$&85xy2-?@S)T!41+Bs9i`(8=K3_x`_XhUglryW#tk;!<H75Z<-j~x9xJ;%^vzYm
zCmlG#o8i=__!P&3UcTGM%2B~e#5Tg6gWc$ucG7H4QZ&{jEUSYpcheF%7h#>BZ#`Bp
zY(uqbPdVE|F<N%9X66t|UdNQ^9TQg6jveQFqXseKJ(uvh2#{2_&PSWCs%$<rj^0|j
z4Wimevdr2aS6dNs1aM=|wFC$dD2oGJe!?9J<8vAy$&yVGb1{T%q$`2VWnNrbI+>HH
zf0c^d+1xP?iL4P3csxZvJH_+&Y6Of6VTD2nZ(<X0A+>J2>Ksok7uI>#^~&*-$E5LV
zk6^X!11Z>vzCfF^5Ib8sI!+kjd1-6{&{B!YkPtp!oz9F3#846u?3ZPt6`MXVST&0B
z=v+@sQpTw-3{r>g`y&Oufv5qRvwtdNiigjWUNi%MZ4Tn>_P3DK3k+OSZs$@z{9}I;
z#)QQpK_j7T_9LG*wQ{c+tSVbdtXS=D9#Y3K+usU+!v;)_dov#62qeugkTv4`oLEk@
zjwXr_Z*#6P2U0#C!cumBsMx28aS^aut`ov-Ol9eu=YY|wcWEPwlIc8aw`8gJML*T$
zdH)kI!z#>&apgJQ<F5HX4W);7>X{$k72S)it`i1Os1#u3?I1J&+)GwlNzAN~h(4>3
zg98k2IZUU0;X!t)3!LQxfoRf@C~skoFz!Qo0SNY5ErARs$nX7n0xMf7DIHKNIhN3I
zUm2Dq)@v`fAKkAB)HciT(zuu(#)Mtab=G<!nhxl7QC04kc}Q!$j)}wur3B}m617H8
z-?!Q=mzrw8e7ajL7$FFy9fQfi;fywBn@v-T;H4oWo3ZO1eP+b*oYvIU-R<mxcOQY_
zgbX?UIg0YsVj0rLnv?eTMFoZzn5V<ng1OIz!Q1Lc7<G23nP_iRhHHu|0vDkuPbJJQ
z)k8b=eByZtw>~<Ss2Uc3gW_-><{S&jM57U*9h=hs?MeJ$9x~1%S*&hso3I7twZro&
zS5obnirdAFZlS}Qn!}hp`3fcHXw~))!4HTU*50@D1P-tJl?WPH&x6bHjW*wjGnDH(
zn<-2qkp{Uas0QMj&=OUCA$CGSR_;x)lt$ldD~qkpV(<A$@ETn+Br^RytO-IGp_358
zdF_V+%ec>B9sa)75;{YIgN67Rw{Td=XWtiKZH)clJd&>#iNV-ly5ZvG1!#1AwqM#_
zck(1>vi^b=!VI7TfDgh)HL()lve@N4Qf?zuhaZeO7$e4i^7Rr^oIA!;;DDaF-_p}+
z^?UD~lscSoC1T%j+3zy^TvowW!qj(7^A$g`+0O0t*w91aRjne?sX#J!pSiK*YgPM1
zsaf}?In_{hi3)HSB_4Pn@evSb#laQQg0-^D2&BFZEsSld3`YG(d6-d-mg@-yDxI@0
z(}N=J!D*v{g{iWRcUSV4?4d-0uRQq~AdO>d-83#Q6aHGH`*;U@!J_v5gv>h(e*bfx
zL=!)}oI`IEDSH;4iLywef>R#(>B;A-WKro?Uf|2s1`3WB?ceIJz*&cNtE<?bh(BOK
z;&Qw3Dkz7hD{s1&6T4ApH9E0$53Swy$UB^1_a#!sM6|q0#r9u=oSu?5q>yLT@YYQf
zw4<x7ztS^Ag~f~0h8>Qg)|({+>p`E!0aoMal-B^#HPYt0(~spSL3!EkQykj%+3W$O
zd_IsXc~+Qpb4SoBj$Bp=psgJ>iHg2;)~X;zL34?Z)gU|MCRecaZB0@vv89YJ!CL1x
zI$iSQF?L=#MG6kC)gu}yCvLc{d2=+SYK>vl{>fF1R3Jh-!+fMUipcU!&$pgnJnf)T
ztD1^^&|E92UjM4qQlk`_laEYy3)gh#8p7s#n68yItrjuLxxw$<IkwRKU-)?Bx2=xH
zWKtl9se0F6)wpB719grf3lYiLcTX&YU9uphwCT+?OVCOeDo3aYi*^)Gk810-)oUFb
zFIC0HJ}S4{LTM}x*jPBgD|bi446_e36rCU9aJcP!SpZ4O>x|`a@)#T0PLwd3H!u&F
zPZy6}cXW&UyLW<mwzqjnVp9s2twM}Pjx5h43A|f{rEk7%j|Ue`6u9ov{dFVMA?}-3
zJRK$Ot6P_-HHDbjA+=k3Jt>rj0c5P0#-Q%m@exkS!jaLxVrRhkocblX&PfC<q5{ot
zr#j%SS9Gpcjf2f`^Z~jc=->pe^VxCrtAPTm4<dNUk9D4Qp&CC7TpM*FQPPBF%BJ>A
z=EF*2vo}VM$;n2b;V9YQyY`M4^LeE`h)Ajz!qNa<xPiyxk<C$0Wi{?_$pDHvwboGv
zlc!&gx$BHYRD3db87*oPE6$JzU4X@`kUn&9;T>zn3?OJ4CJ+WZ^ENHr$1JT2`UZaI
zvV907QsZCkTNe?k`zjwBSv1GR&Jt-K!eehN73HE>85}Zr@5)93T}-&9;AAj=hq#ur
zJ(NVXZvdoBG>YF0P-pAyH&Cnfqe|6^spuA5YZ<-Co|f%zg$^>8Q2r7b0zc(i3Ezdh
zwgbGXF&R$Y$SE#+S${ccEmz7+D>qxNim#;#zq@?L@4*n)#xGwK`%D#O9#(7i6QdF3
zQ@i$^H@je1+Um@@7`DLsvMxoNy4LsG-eWZ!q?R5kanZg?9=ku;QnK&VAVenUJ8KcU
zxw#K7zZI^@a()yE{~ixCk3mKXo0b1LT5MaiWoggT&BCD3a(R?HaU4xcd^!z?C~O%j
zpTpP76m2JHQ}qLj_FHW=sJ2H^#V5@`F;sgsY?7~|Wfe$-L-pgGs8xKp2o|OxVUWZv
z+|94dc!5M$w6I2F&fo#TaNq;lY$Xnt`LJrje2t^!mfgA2hFnDF5#mEuxIqcxx>${V
z;|4Z~cd0@A-z7Pp`0rl=TD)1-f2<i|s>GB@{;2UkiP9bDf*+_@+03&ok}p>bE(;Yd
zje!QYe;l!B{7P7mm&q!we@kf~T!mUI{={HL(E^E+QPWUei9(1~OIzXtw-2w$8A)ce
z?yq#QiS|fU9F0?d6^F)UFxC~kl=MkLu#A`R&5dF62ioj6<|yDSdYCURY@djA{&1@s
z&)9-rWfoVAd}-AQBfpF^bV->Mx_#rMCM>z0INqa~cT|bMk9(rU7YD3;1l6{flOtC_
zSZQy9t5;8Txe=`@O9hih==)dKg1^dlyA5^Qt|QaW$FmA!iW@sXS#}`7cg=ljlb10b
zNvV7wNf_b7h=cOu*QW-?gL<!K2qCuNi=SlXQ-;Mygoy-&S2pf7sK$~-`&jojX+2;4
zR+A9-K{45HC)0>K8TPt2kYRSla^M0hz3e3C%DCT+K=V6>*lNV{$h1sRoj#)%E;rfV
zlO&IPcU+#j7k%&lyqq{4QC+-lvi!%Jz0PvqoH3qlPB`Qy1p}E{$?M58s<wgfHt9bX
z=Z~_t9hT6Y>lZe6`atRVK#Yg8hL22}B|Ihvc+V9nutJ!psev_}5|4(;{zGNog@r_D
zHN(JJq34(9m&6~EgDS&i%)q%UiK^6E_^|u*Q#tU6;iA2p{cP$YFbOccd=E$4^an*Y
z0ZtZ+L?haK;Jf_~GGP~olWm$xHQM?RCnkKooueK1yRVG#1B}t)0+Q(sQw$=!Lq~VA
z|CGC5vT0RvS^B}QFB+>CxE;#YylL6O@VmG0y^#=m_1!oSS5D-$pcvb7as={=WDu%*
zh)2`AY+$U@6L;t151^|Amp6^S=*@X(Q(sNJdXd81(IET3GBu(DnXA*acR#uQR!~a?
zUIkTZ7#>#J<Io=1P=LF)p+}-dwzEWpS>!V9JHHZNoiR9FD*RbvFNAJgWX+-JQI^_0
zqLh5~9qLp@=&$N~>wrY-`lZdGm#g)cFiDtNX<q8F;)=1Pzvn=ImZ1Pj01%LfID}GO
z&lj;&`IpLl%$H<jS)sWh>vRO|fB6_p<U?u}=@nU9Mf;DM!Jiv8&Jeiyq7C=d6Q}=L
zI3P|hUZjnyx%%H>m=_t}N}BhRDX7JV-Q!<=7zmy!MtYSsR)PNILmPVtV5hh66RZEa
zQ=)XW25lnCLy3PmoQ2dcMu$%K8o$u~QBe77gEsC<y;F<o(p>Vt)eYEQ*T`k@0Fpe=
z1NZ>N`7R{U<abTWizF|-FPzK&a_i(;9SgH%3nkM`T(7s;H5w#}GZ~%n=gT$7#kjfs
zcMa(8s|1FJfLYjNINPEW%$3G=WM9Y<iw;I=(ivvTb<9-2*9hZuxE?+v%Qb)==4Z42
z)_Yn2bTsM$$bEO0=5l+p>~wYyn(9EA{ADSo(d8xy(~0pKFKr@*$dtkD;igQ&vojbi
z{H5*X>T0}Zeo5><i<7MdlC72~rsq;*zzzGN4G#a{5(1hU{?Y0OXk0m{L||!bU|7Su
ziUf4GgqW+fBF5oyN*KGjRZ!i9tu*gJW%sa2%l2CIr`}odX{t2dRvw^N0S%|H^F32(
z@%FfIa+7=JS$xZ{bh@<bkFI%@Ew(NLw<T#v%%Pc7pjHDz$sk7lnaodh4j2n9c5{H<
z2PiyV5O>CX9`%m<Ih(asWIi(lD?f<HfmWBkNF<Uw^3jO6oasR3>KDNw67}`3ugkw|
zQXdrl*4+QNj)B~-YZS9GzP>Go*jrzh2v6fAkr@%JbnDW?d~jVRgEX5q7shF55&*2p
z2AdqX%w|(z%~)sTFIug7wR`kb$!)+(s5B+OiNo1@#E3%<v)cBv7H>of&xV=z3n<t^
zrDQS!2*}BKD6j1^n~5#Ie@bAnR+VzZswT2N&MGw6jyLxq(5h3{+Pm4}ke}}8@S6kr
zQEGckXvBD8E$-qIf6#}J4f;Vo+Se#An{G{a$Wf)Ww}vg^djj`TS5Z1zZV*YkI>y*l
zb#R77p^<*+UzXO4Aqqsk0`1&lF)zvfDzV7*r{Dx0B_spYARix$4fhb)uwt&|T$oJn
zY}blh)_n@~O<>&00m8cq@>iIw?ps8m+uU?~Xc`PV$=c+g=c^P>+Ypu_ZJ<%3axUPz
zi4g0a*%O%muhZFDAki8c-*P5_^_gar8dEV{X#h<Q;F*!ZXv`L7n|x=eOf8zU#8k<k
zImG<!_wG8+p^ici!+(;^+JtX_yh}XBkn-A8z0M<JGr^Tm$&6?3%IR73Sx3%^2uRgs
zSm9tQ01A>EMD<fFg@#zZvz0=8u{K<;VeppRHp}IPDo};rA!!(?wor{+GEo+w+RT8`
z15M43s#ZzDphF^cUuPjG-N_~gS${+^Q-NGXBbU$0y1zcwcxsD!Y>c8%!i1SVIlHQ!
zRjmJVfueVZI}cnO9fuz56mrVV-dGj&3WUuYi{CO)X>HOfG&tSXGvOViy@FUI#4C|e
zEwZ+lXOGYn+I2Y+maGL|u@P>xZp{aenf9jfcKSDiUm7>od)~)YC@j`DO5GnZIrS6N
zG{41Z{GXS{N%@D9&oz~zZ<bA+GFb|F;m`)t84iTCzQ%5y7eXg*t~W0dEELYJA;oa3
z#>@iAU3o)dl#{h=wYnln4Ny^biYvb<V5u6)6`7Mx?2m^<CI7gqT5dqT6Xu8Z8-VPf
zP-0S<+Tf4GuxVtS4{-p2(6#uB57l;;*^UQDPkd=KTY3Q4gf@gXlpwTkgf!wRWkwuy
zREv5Z-UfJ9!boeIzcUP{)CrKY+ACjms|r95xwQ6Qc_28_!D)s9=BGcZ56&Y_FDQaK
z)oOYe|KrpAPr*AIw)bqvu(rJ-fQ{>HQDYb%DXeoTA=F;S6+t{rt~t7!-XlqXtv{wj
zJkMi1a1(bGA8Wd(Ty-S0?5{MszG*wOT%GGW`zEETV*ehKi8O|q8s6O@TBXgCWL_{`
zjI}o|@Hkbje6OjCJO5E-PI&>fy<rUZ40KmlwGD&DVta|myIqK$aiE9l`@Y5}zrQ-l
z0)$0bK7`OjHpfOe?9FjyR#;A`;WRFR`5LQ;ySloj5DdlvPf+T+jq=vIzUcekNWdH$
zcdby9;uO#L{rhS_g3J9ZEx5b+<0~n-`tQ+>ccwknp~8%Jd4D<@U*6e1Cdf7#LU&U`
z`*FcdKrb8%(v@00^V^k*k}h@lff;~`3R9fpPo>71tX^~6jk?z#GsS~LEPWsZw=D$<
z%Jjh9n%Qk`;t*zEI*!JVGtiHOO+C^CR2sXRrKX0BA4J~`m)+K1NJX{_Krhiupw-BC
z$A{^(7Nl$Y{rdV6$h9Ee;fvcmldCg_M<-S(4Mqy(dU7CApH9SL?fD~$M1p3y>W}h(
zpuf9n%)R$rY^UY2KJf^noJbO@6J!GuV$H=eu&R0Bg8#f$8qiI>l>V{BL&V-#x;zF8
z>qdHwBlH-notr|bKwuf+sq<$R#---%!`eU^aZ5YA^yisIN8@^zQ*16*?A0|Zgv~Ei
z=&;<7tAr;OZ5y-i-ZZaizW)RRi?cSCVe@>p9v`**I)iAJ(SShmcUw@n2YkYepPn_@
zs0kv>dy(*)#Mo{+Io3#Hz*2F=uN`#m**hZ6QLB^EyZVL54(Rq)ReCUUiId;aPZC8*
zVo<<J^4`}K;&&XuAsKe|CDvjmR<CT<s+V@2x}{v!Dd)u6zV$*Q*Yf$sMk3uuW)mRY
zezV7zSZbq;Kr@V<Fl(jW!an9GV5%a7iSlQ}c%LkR>TednAJ;bFqmBNwl?n|j;Biun
z($-t$Ud(bbbv124^<o~&bLsQj%%*Gb$78Du*ZJWZ>8olYkj@)|{q%;pL?!jD=T&oO
z@|5+$9NCl%@rQlLh{_V>QKOhyo`6bt(2>9Hp{g2jQsbU;y(g{PQ8N(!4??+<Es>)f
zNT8Ri0(5$Q*6x!G0cf#TfQOHIv-A$!XcJfOY#~{Msgl#w;4IshtNTIt4fKFZrmGZ;
zJ8K)v8}m6;1Vpxv>4HE@&?t3KzNA14mMGx&%rPn=kokgPxi-F(kYR#Kg+v1Detx&P
zJ5S5=U3O!LlxGpQ)pq3t!PfDBHI~#N8sYvL`CU2DQg2$GT9e&HS5FhUjHs7cFKi}$
zsowL|IcVaSk=RQhm~2u+vJWxT?L|;pfS3KLWjYPs85mi9j*rHbMyACKu}42nhKgHJ
zFH|his)|XPAQxzAsEYfJXpeJ#b^bL|M{l+Bl<;9*)8Ea>RJg`^am{_MbF4AbP6fC?
z2u}}>qSKFn)lmIz6#l=aeS&FU-qj7UkBzpluDPu5mp39tQ2_ovktv_y7-ILV98}r_
zA#x9SIngEGlv{Vhtn%8Wx(-ylPL1|E2n>LjbhmSE%?cy?nx)>=X6xuCikz*uC*!cC
z8M2YHDNk@XXrf%xS^VfwAXMBbo#=b?X#S%2_-ciFCOipO!x6zl+f9HhlmJkLCWAc!
zE`;e+C5!|0Ll99TKO4$E*t&Y{cff((tyE-tz{5=TEY<#WVZ_2)SrVWS%<p6IT9|;R
zVuMyu(hl+SG_PYARJWar4O;cnQu0U{$Vjpje?jkVgI*p-7cW-^7nHVV!{Obgm-6Wz
zRtg)$zo*;v1?XpWVm-=8B1;6g<RtnDH9NRqTHwMuW1T{Oqm>HpNa)d8!+6?G(DcLF
zaIzHsuE-S$fq@y;A+I4_c@xauE@$^`BibhB)SLU9pwv0l)}wE^!VuZ&Zhi(Sjm^CC
zYgok}Cm-|h@9^j!zDK=aUPbMl88f!HdA@EPi7}noFq@LfqwZd+5Shjl>dl090J8Lf
zinLU?Lu!-?0Me1D)~qm?b!sLLq*>ZOk2pzcu;R+;9nCjd=3|@M->$i?4bP-$$wlf|
zY)#lgI`@`%q4$Z6;{HC(47eeFxE9^s2}25$`u{5BdOV$Na?b;(BUKoLq4pn?ZTB|l
z2X<$|M^J4=DZP$>PN^g`J!ou@>-ZXJtL>I?K&whsr;G?awuavj->7>^U)R_Y5&LzG
zQ6b_GaaDkftiy7d1B}v}0Aq2*8Lo-d+z|^>KpXWum9b1(h=FO#$kDbx?`qEmUR16c
z+*;NfHfb!|_2SBXvz=f^9uq8@Q=`pWz)CVTNp(Mh9OlbB=xpJMn(Gln3fzY|NHS0k
zE58;#y)~+idks_o{^OU``~GE~Yz*G~s~XL1=5@mhTCG5A2o{Q}XK;SGjALs?u7iwB
zfQ}SJ!#GcW=|nOn!RdHz%SLJvP$rnt^k!LT>!7Bk?U%PKQ(j%mRD?XPd+QyF$FheS
zY-_Pv`xgq}AgKq&XS0c;VK=rW&5v3VpK$(vMC{dbCX7S-NaR=IEc}@19#?MOud=Jl
zMYnZJBC87G#O80|P-0~yfsEJ)VZaqKgSqos;Z12bzfP6#TG39wt`*$rq*2>(AYt|b
zcE0V#$?JU8s<>MRF(RkOq{j_QbRMK)wUW~Zgq{H7zPRYcxdH{rxlktPcN`is6q+q!
z=4wHRM;j3bY<BZp9nd1Lf#ur4*g6+KE3D@HG0>fvoXsZ%Ke1d;x-xJRx-7_t-Y1bu
z1Xpe?{JfK-Q_eL6LohX&-v2*>Kd`I`B=I5LU<q<yDxs2hY)sJ5@R!Y?FOkytX~1@7
zDC9JQ7^x3M$owIILv`ux^ZT{|o~cBD%R(E}+985y(x3lvBHu%%T2LlCczU?I)|~8%
zYV-`%aJf<D5zsD8$X0waIjLXym#}KkusYyuFC_}(kMojbIRvN{pGFws@_U`Mld0!{
zGBXvdI=k}Ec}K5cR9omCS{{Vz2}bJ~EXFy0|Lqs~SLNaq+g<D1!&px6+N56Px6Mpn
zHMOtT10=(9O}dM)-$6&?-k*mO7~){<yDd8PX;XMQSc&^dk=&ZDSG^7EC=Hkc9BV)H
zm<DXo4o=f4cv0$&S;d4MVDqM20cgTsp7CImsFKgRyY!MeGss^vIduol=#0#9!hDrr
zOC3}SoUG-Mz=&AIXT7LaaexnCj9xkA%?xZ>iw*r;PuZzanF=oQTM+B22GG0Xmu^LM
z6c;zk^d?KVTFu|4H8P)RpD$Rn-k-2)NR<GzR2gbw*`Zp2ekPu!08HZnq_h^hupjBQ
zYq2gt%4_jTY9UNR8SF}K<8C4ZbC>9NS4_fwRH~s~PI&rZfOCX~|Gu43j=;C!w0Ct`
zBqn)I_>312Tm3By_um)n_%t<`3<hS%Pv3=S(i0Y(H>ySF$xpIBlvGo_`6m0}!HT!A
z15^t8D#{VR;pVsXJ8>s7qI2JQH>lygP~x1Ib&dDalR_sQoz;^uD%o*IGaivzA4l_T
z7>cfIlTahd)U`Hzgy(~@P>q&7-qifm^;UHAVxIlAvul;#m|mZDy$J$eMip^byBwXX
zkL1?SyhEJoIW^X_y58C-s$QG*Lanf0%VX?0AJGbN9>Q<DmS>aQZaG&;^g_*Q+0>z{
zAMRz-{494s8X&IuA13Tk;+56oH0rZtO$UwNcfjPM@dHF^D!33`xO%6navjhO#fM><
zA_7M~@eMu!v4+O1ae9^fo?kEiB^X`!`<Z@=t1&u|zv?QJ#iykT`+{4W7|TM5lu+dN
z?G%_^%zCbkWU-o@ucmEOe`;ybkTa4pecdm^7bWmFFdoH$o8#Luvu`XPCE?beE3Sjr
zm{%QxMSkng@z7u)he)XqiK$4dTfmNSJp^VAVn$>d18mZ2b_H@p@-eB?&fRvJEBb*I
zc9~#F^v@ccQx`0n&!N>9e<@af2n@wY0Nd=`t=6dlR&bx(XZl;KB?9ReN*W~gI)Xrz
zE;d{8;;+mzaO0)8XbkQ>%7Kt5;sSY<M?F)`YTt#~q5@a79lGjq_RoQT=g6_;$s=7q
z1GpRy<h=rreJqjU4}8A`j{``&!ASy3jt1-D;x|k0!hqL;Bsx0%OxWE7!+%X4SV>Nj
z8k{)%Gqc54CW$}bdVN0uB(wyW&uy#Ie%vwH9i<K!Yt7pLvd+dfT&m9Hi3(??W!@@!
zxc@Nq7u4S}4RBO0e2^1W_fS4lRxz#Tz*seXw2c#-TJoQz!5?m06(DvKc3lr{1lRo6
zd;fn_7oUU=vO?@66BpS3^%wt68n{@({33XqTXJi%`Ik=tRRhuSFpQgt>)+h`U}FeC
zrTcN*4E{G0u3+*Pim_4Q9MZpc^`9XrrgdLp<vXByHG{NE{w>+_QwGR_W{yaX0N?qn
z4D&)eSy}>@%^7Jj$I<EX!y-t_089;hXG~|!)6!|HD550*f}&fZ8cqqUm3|vj%=KPC
z{&_fo`VcT{wU4Tn+&~(D*=jU(%outrzS70P=Gp4*{5lQj*PC26C!+~cE|(<Un>+VR
zqPtT`0=bK)II3g|bN!8bTjYLOFMbR98fk6DQ;+HuyET|1YOX?Ep`i^I^Mx8hmV(2{
z;$ybS;oMNA{dO~14;)Ib!0XpfOwLD06bd=4o4t{V{)l)Y-;qfPyuEqYoem6Q>@~Sw
z5!ZO!BB7usgaJAeZ>~&Qw&B3k7=Rbhv}`xxs+@23M0Pt_!Kc=4jvLF7(#NP7LI#if
zrKZB<*>9t^d(2la%8@CSfKzESYbBFG$AN$;gty+o%VB$13&`}-OsdydwO;Gu00@=t
zQB#BgAb7rEOdRrbqhBr=l90Cg4iWcvo`SLIdiP-*w?qsXFp=L1n%Fv=cQ!egF^vrC
z+LD%ZoyGEF7IDAy@KliR@Mqqc*6x`tKr-*K^gJF~ces-5n&Yj+|NGV%{k#H<hCc0G
zc`_}uy#V)>-9v}gl~jyh76tATd}jFavGj|a)NR-@lW#fa9A8##rl`i=>~_fj7&gO-
zwY{6s+>KQtX+CoSCfiDlBAI6&#b$YUcH0MNtvUxEpvo)$$c@3zm>ZTE+0jztzBB;-
zV*a!?p!?$Tt+cv4^LDJ=RaK*sFQjvwEv;QzMLP-I2aV1$Za+=ZcS~>M0$qdT)oX2p
zh`up%E?hAl?e2<|(($ER;BaA{K1u;to5?(dM6U;1gAo63Xh*2jd!s|iH70#gN`OSj
z2@BK5SESCI{*myBfQ*YicA>7KjNj2uI6N%jf!+Pe*KmQ}@?44Y`04Q-ll#>l)RUnB
zziYm=&Qz8GY#b`3{9j~4`%{*YW&rRe8xkh<*jx96j+f)(*#U-sc`AVrgR4^#s6@j1
zky#?uoXo?eTDf>Z2V-x&C!BiTw(O$<_^MlPXcWxl;e7JL>!aSjyESfZh4G$Hh}`|(
z50{SA%Iy+=p+<1Wqw?WW79d*w1{~7Amlo%<NmZThy*L9gnaxFbyw2;eC1P0Vzr_}d
zzV_KQ9Vxb~1n^k{ztUaO*j-b!*BZ%;j~Xk(s7pi;@FLEDLHl=hFq#R_CME9fQ^AB0
zTrV|Xv(3XE0Af#{fVSAw^49<(&bZ<NaJ9<YY!z0zc3@Hf`Yu<kcN#$Pr`X=0l#TIa
zFwzsEfSI(M@eRY}CJWl<kwE)hM);1}Gvn|9DtHWl>6iculeqP;ITniBtc&cQ#NyE<
zC3uI66+fyi!PY3Vk5n2Nn6U+_KTuCt1H7*BB%0cmAEkBZ-S4!29%Q!8&H&XIL1OXv
zTnV&c<l+Gytq7Z1FY1&ysuXHV{Sbhan;p8ZEC-aUZlGB4iyn+WR@93S4=83C^eL1w
zdmt?~xKA^n@;twKY4_DKc>7z=YP-D-dLWvR<h2h5bTkb>j(S<~SwvoB0XA>(WYdS2
z01*X{IKxnH(kshOt6d<|Ec{TURuz_3Bq3KX_Jf4ko}#;OTbSH_`b|8IR#_e|vFL|1
z@ffl}WfPt<;iTAbCR2}Dw}X*X;+i~%T|GS^e`1UAoI?j76J9Nwo6-L5ysSO?YZx{g
z9~O&6^fClq+J+*)!C{Ldm2pz9GJ9j#`+>|bnq(*k05QRIcLanh%vXoz@%nsFZ*t32
z#SKQK{_Lphs99&nrB&~sv^SNn6p4VtE<IZgrSMZQwGyDVwBG`_nHi)+1*$Fdc>wy-
zhYsq7=EG5)vR<qg0A3N<z<oYGnCLB$c#C+)>UKeN9r?XSywYmXXe&zjN|#x?!6}%`
zoR!r5YA}Y;7}eHOglB)+dexTrCnhsRpwh$HW}vOU1(0J!p)9SVwOD`9tSkRWLaPJC
z?XZ)en5SMvb<QPpe}xn0sro7yjkZ_6`+5@wBLpz;$^bN*tYEYfQLYd?{k9pKrz&$0
z^maE;UGViC8@)Ll&mIA|DSe$#F=eHt?GIeiB&lzwaF<8A<0E=%#u>PG4|db!vx6ei
z(n>hr$l5$V-Q$sq#r6l-95*#0jfdg5n?64Un)?KNZ8}Y!ud1^2@^?O*lfhwULZ&(2
z7IE485<sbJL)HqA3vQaTkc3Z$=?ZtRQcXihSzI!H07uc!2!-appkG?HRjb$K)-W=5
zwD|GaT2SM|y4%UZx>~C<3@*f!?>#bRl1B6X_J}r8Fn9C(2aRjYk)q3MZqK_fWY<{R
zYl&wUl4Q&Gp7#i+O(T5Hx6c^BmENY;isLTyHn-t9)$r*<lx%FpB4K3>BrUh@XY_-i
z{~s?QJ^l)6kOSbDFTC*|tL5=7BO9$%B@>A5HZ~qm?kr@B`31OXlNjC_XJ~+|WixXQ
zP1+VrnLKtr=#B#k(zUm^=rNJn<#>S*+@=fAcjgDjidDj%;ya1GKSc$;?~mShJXbj5
zy^_N@#QdTyDEHwL2Z3G}&D9dtRhU*;XHZgti5Ig{C`c|-IFz0w2R+*4rx?@KlKXL!
z3W|^g6P$B1zOj}L-v>U_r8*U->lils)QXL5j`JbxLaipjcVj;qt_1>$n{+duXsh<R
zOePAcjYd*Jfc#dvUDaF!%I@$YUMszTFwU<U*)&f#_YBRhe0JVy1xJb27Ox=&oWN_W
z3vQAntZayTiJh@bo;l~EZ@GKnZZHp+ELPuVm!+pbul4dZq{ZE|MLh4a5d;N%{S;r#
zzVm*%BHS8!luomE;K?Gr3tKLN=Bu>0@2F8w)NuRBn?b-H5hgVcp=8$NSO3<|kKfn6
zPT6z<@9^ph;g?)4e)q45GfkS}2z#rke8O_WkqloS2a_y_E4s<#Xbu^$=hBe6BkwWI
zkYjYgWZ}EC47^|9jKRIFb_FKuMLz9Z;^)Ee(Rpg^*GyJZ($jJy6&Q8}y04H#ukjvu
zJpDeil0om{;MiV@dpCl9xqofdI=)EqW@TkfZ#G_>)-1SGn*Jq+gJU7~IUZC}a3{bL
zPQDVy(+D`nn(osP=!kXLZP!8&*cpt6zlPyx<nykis5>b?`hXSR{Rl=a8uOM#qll5Y
z#!lsQm44QxdYxxs4mnCdoHxVsK)3vLs#KSH(Z9(Zad)W~fGq5Px$cj}Vy}%$f9j1?
zU{5z)tp8{<bO#UQ1NPpw;us7cWX+>uWB&}NJdBgik%Wo;306z<%glVk$z`5*?0`8=
zKeQ}bnntN24S=2?0InMlwjaWOeY!i2c7b<0k`}PLbm0qi&Ohdch|QWmHty-DL*^5F
zvBJTcrQlQFkY`+}Stn27(xT&q{s{IR1RSLKPB{F(>f1=SY1(oZLL!o($E*k=;?e~n
z;OqME596!9`$6JsHB`6xLJeFnM_);#6O!K}eGTO63d&ZB@PJ41=o@-HyLEF~K|$Dx
zio;$h>$CCZ(`W4opKwTN;S+-G-|2i(mK054p;*&$AXJ23$z&hLn*pO$81OgANuQy8
zoVtQ=+0n~uYD9uj;T`BUkMYv?Ly8~eBJ@;0gRF@)2)w;&(5r*$#UXAHaFX_I*N{Sj
zMS8-h>D;e89-F=&aXi*HZX~(5O(}!oul5Q<fX-qC%i#fm2V~2+Gam6F=aI{lFuian
zHhwkE91j=c5RY68Xuq^u{F~K?m!WQ-`YvO!#7DKvXQi#E5}%iX-8c3vJ#yRIQwtnj
zFFB#k8ffML&>Lb@Ds8sydcE0<5X+-G;d2qWR(-<VlK;Db&HmU4Q0K-y?Q>DY0h+|N
zju*Fw%xhTLFAylDR64{JP7=puF^}%mB5dKyUa7YPvPXx0DHN}8??+`F%(UK}d;chU
zvykM-DRnP)ycN*#PDh89cA?fu=n{HreE;fTA^(jH3`DjIiz&RuWN@`nmmUh4swz|)
zm(5Nq?)#(pk7>WawlGKy`LAZkkOcehXe{@4uSDr+x#oDhd897yp8V2Vdv=zVknN3R
zKu)72P>aDowR&*bO{|uGlDxez%Y8Z#gNL~bMbcU<2fJ-PS}k{`b03Ztc?vjYu0rQe
zTj?BN9-3Dlu-P8=XOry%O)PzAyB`o6oGpYc=1KJP=b4Lgx|OYExz?*DLIW;O%#?8o
z;%Ud4M#iu#V_wBhE#+!R97bs`euh!v8as3C|0*+4HBh9mVyMCPEJAVlxc-sbCD$A6
z(~bYKO~gJaF?+NYMXdW;t(+Uyu4(*daL|RngpB7lizEG6lh>WF_&0Ipi~6rmr`yMH
z9~WD`ay#iw)0&nZH%(7p$Ux|d1;j384JAA8;x2UstL&#U+0Ac+-vN}tU%WK$k<cY%
zav|NWkDzvNMPWEq3TJ*j2ZF}hv%_L3LA$N8)$vSPyQV?KqO=u|Aq?GWZpqmq(%t$%
zHS%|5Fl6|cJ6Tie*c%c)Kgdy}gST(r?p2GGWVuH2Oc9sHB)<km=o(g<1&@2bcj3D%
z!QXERHEN`uS7|Nn937{U#b1%?TW6CVo~%aKIu6J{mDXLb!+2$jXarq+5VygsdnY#~
zM%!2^F)ZTdPAnSxMYz9A-`IiV%f%P*lI)B2GyvJSoF3tDGg(lx^O!}d4Dk^rD1>0$
zpI9{dm3C0p;J^?(8!e1)i2N^Eu&01tUsToJL)b2gX~kp&)+@VVyC*wp18+8`4FV9`
z26`0RXAB78Nbn90$JIU-;us-0NI9$L%<vF&6+TpO(VXnPOvDR%4wG==-5_ZD5keoA
zjHp*-(1+>ygjCsm@xx0CY{w|-W=5-7Ti9ZZMAbh8ClOY5OY@2B^ECY%RGRlZY2Ht2
zd5kPsO_9MD)ys{$xz=I5$9H>^$rmKRqbAXE9XDs{g?-!He_Xm?qgG*5ada7vWp~y<
zq=vusToehm&FqDz>Vu64`FQ)73OZgU13`pX-irVESOu!_Iu>^~@{Oq`FVXv11wJpL
zJ^PvD83LAv&bo0@#k&*bCbzamywP$k<3&n~tZQ5jw^t$vhm-rnrDkIUjo0$>W%EuK
z!dxR;td47eNnZ*mfchd73>AliE8MQ)ipS~#xndqz<k%fxdB+apJiW`KiU5y)JNFvn
zN*Obs%hSL^p;hXRnJaWIKgs0J-eV`zEGKL18NA+NK3J+#yIgRhyR7U{tQnmL7g!PE
z)Ef71WVw0RtFy{?3PnNSAt5nSk9ZW!R7#C4WCQKWb;VAVK_qbnD3;`a2Cv9<Z7Ex8
z0>k-W&3O|STCnOpjp+SI|BmbKeVdOb$K`gYd3*ux{%Wswda3w;vtM%k$1<sGFEl$9
z<a@F$tZAD4C1?6rr0DNUpT`grMT=xt^>!wYakvtbAh)SXw0XyT4GG9IdtKyrO`~``
zvO$An3|=fEVHVvzCfba~!@qp1(DW^d6JnX<Kp-@nnf@@O4NRdYGMTicr5p53B?$Lj
zt>_qoOi?;A(^=ujFOy_QDH3xh13{1{!m{M^{q8W>KY_sN+Z`og-lr2?mlN8yaQY(^
zH?@Iy+H7}kV$ld(jdk=f4qDUtv2(K5my-pc%g}({p6DfmT~|<$rr+IV!9J6gZS+co
z$teGw5{Xgtk}%9GVkr%`{SboPa+x%4W^Ri6lPfGZB362tX;7STe~cVd%hO&9^C}28
z3vEHPE!Hy2lYv`#%rd*TR`c8fqKVEQFN$0TrA`@1R4n{{V9xpgIa#IdRxgWW;3{g0
z8e|=!cce!ZeVmw5Q<i2RB+5%ooO4|15e^QBUkHp^sc}9ItLMILM(+X5nKTMtYeg+<
zWCrFfr0*=ZB$tVL$E~p2MPl(V%%*87+=BZf;QCeqkE_BwuoI!BgWd;39H%~{_P6u`
zH#Qb@x3~F*GoO{md-UI0hKUPPB;Cj0jl0`K2$b|!P-G_zuM42FvbR;m`^Gl$U&p&f
z>L`x|$zXH+dSaC<A+d5heOGR=?L44zd9uNHNU-h{iu9|SXZ{xtdbX&{uB}o)$a3tG
zftcmf`t->w`snEBr5xRL<-5t7k0>bIM-tot{$F>PEcJhQR7)9}dxTsuXTo~;DT!C#
z)^5RVOYg6!537hvIyx(G)lknn$a_y@DS4;=Kg!-Zs>-hW0+o^wK|w%3LMcHS0i_MP
zq&oxw>5z~HQBdhFDak{3A3&5&fkSs6x(<itZr=F4ir*dM-v1ap<2g_5z1LcE&NcU>
zB79~AUzMn|HdjKQRHs2lED#MirZXAz^GJ$EH>gLSSI1GF^7>Z?AfxVi4&QFV$_ng}
zSGLiQV22Sh(nXU^u{Nd3h~9djpjjVH<pg{Gnw0ZZUy>mw$GZOhVmu^iwE^n98pMYt
z(mW!6Y$x;H+_?PlRNYsvJu)dAh;wMN^g9~t-T>?@+TM?{q3%Wj5Cz(-(4sgoePd=`
zUAjU$C${7kQgXpmf=3nRLoyU&YUeY|Q_{QT5`_#;vK2aAWde=ZTqCE&U3`1KV9OUo
zA-7pTMDK%Va(a&eFycjxBhkcz`v@s7dckx8bZM|-N46$Y*y7s!UZW=JJ@|I?Lu<x9
zaz?|1rf1D^(hUs9A4AjT$P8PIw4_l|nS&v%>Z9$E9V_u9cG`>tFGxj$=y<t7Mfj5W
zb8o7p=It(W>7f;eay`5Uf(MJxxE-CK6N=z*fkUBIq?BS=;5lBqlUkh#hkK@vk6v)J
zoA9f|D@9S0+o052-tG)DrmXt0SVOx+^Q|yVp1fX7F*tn+IKGC6=yE=wUC{FtZ+-5$
z4IK;}qc|)%*$i--ns;U5Iw$Adpw;?*e`kuy)IZIm<IdH-a$p(Q6w_p|)}i)SZjvnW
z%6scR=T0B(zJ?2nQHD8bi-qp1ova>uH=jDRseXStmB-d+B#d#z>=ilW8yL0Ace$p7
zcaAON2ea3ASBg4!{4zLRg57D3_cBWA60dCH1@6_)SR<eI$jRPQyLq}qQuOM*Wtx?w
zQoh2m=w>i_@J`ET^Z~X9VeeSya*tgqo=$DB*d7fOMX!GylBU*pF~Q94G8~w2g!>l%
z9Jv5QG5O7u%_Wv%3AXN$x6b_VHw{Zxpggsh*%8PTw3?S-cV|PL1c7^9_rto_T?TF>
zxUg}Bfvu*b0%NUAa^(uuBr&2So0y3-SXaZ9LMfk+(pa2?>&n4DL<sAr`>DEU(H(?y
zlt+C=C+pj#n<Jsa3N1B{ZIDuoOOGy6Oy@kpcS$wjv7-p9V-64Fww@HhoZk7!L`uR8
z$qyr7Mo4R=WvY$RdmDj0oDq+PTOFDfN&>bc_N+{k26QrHwky}HY_;GCk-DnbUl#;u
zr@7g}d|AQ+Bu9%lx<}lgwbA-dQJ=u!5h8M<bR7Y@dXkvYlrQ11s6<Id-_W!V{-Ko>
zru`Dusk|S*<3El<e`M4iF)*Y;Pr<c06CIBdrpktr<R(9F>}_EPX?3v;*;JRIt6Psg
zYLcc5q=WA4#FSI;H=gr~1U&%#JI5>qc7_ag*uvIXlBG=W{dR|yp@JMCWK3OuL5DQ%
zSh;1cRponmHxja=fm>I!?A%72BuD9{T7W(2s)&k*HJ^hS=}gAQ+aE=z>U8XzKc<;<
z1hUX<1;I7N&!ExO%w<YZEy}bXqvqOax@e(#i!3${?%PvjvG-qC(2_s%m6MP!cdOU9
zFY;ILF1V*pB-qCpzPqw;o@_WIbWkr@LJj{WC#Ny6HjdcK3HT6YH+yhbkgGgRWmBcZ
zx`TOyQ)_>}Yt_K0L{64@P$#e?3cF-KXIjSvlHU4u#`VmpcciBN2#v|7+SQ%P-Q5?G
zIL!Z64+D%epbUKBxn?ZF&)uzQywAfXHnFa(d3buo^Hp1%PSOxOTwJ!qINqA-(Eau6
z!n0@8(t{RecWexm^ELT*=mBVTx}+^w=dye*X1LH-k9Z4L%*L$Eh=XY=jvDP-GTKcR
zjPm$n1}!`_eRiEY-pPya3?Oe2?!uA#>p>|(6MC9H_4P?-Xp(hQ1}^7kf-(t*<ol2-
zI&}|r{0cYdDh3h|eWP>b-|8lgVI{RWKMoFZDq%6D6;@+Bvt4wg^-NDb3VfDQ{5<8H
zS+OA-+0c)b)yd|Q_MwB%`F&&ncN9knnB*_KwGAoWO9xj3ghwT^kMtbSOuPt9d`eoc
zQJ~Acw>F}C{*%p9z2mkD&2{zt=(cEITzH=2wSIV~*l3QkR^uw}rYQFcub%apZnIbi
z)!9OaYgW8S@ZNI+U}nwb=)VQ_0x4>Igs)*z8_m&_r|CSqUNO}t*xHOc(JaK-twiq_
z7TdWn9Q8TilUz7`Af6R1$8+5IkqI#l7n*c&P5NtGp9B1(s*Re>;0lo<?O1~}6~a3v
zknigB$E;fAa+o|}8xKq;#H8{q7_7p0SP5+<L*HnZuZbS-HJ*F4zFju%T3KCXB5WXS
zVJ{EuX)cZ#wYFd@@GU#!oZ~-PR!GLH^f-49HNEXUu$kdYBw<#lK>IeH4<SC6>Jdp!
z<at{5RDP76SM}9+T>w0C6R<o#-7}4rhGys(kL=#OY7I#|%J_sH*c=$v8e}IUJw^9j
zaj@g?<P<5zZL5Br+s9es^q2u5Az$Vkx*I;%dL8S~Iydd4W7vt2<F6z(bj-B0<t?{x
zzP9+B=I11Vc!0a(@P$tU9L*(6WaJF^KCigyC{1iJ<yp73;T|^2tSln71u_1b3)DQQ
zJl)+JH_sIVx^%5ylW$gBU2V(aJm+<WP4IiH{Cu)oWOLS&L5x6<24%27?X%w$N<pK<
zncCj#DK4_A`v~&$#v5lxkwT2<*UM$I<MutBeyBfuJ%FkwdvJ?Dom{jpz!gb_gS^+|
z5JKORm&jpsCx~(q-&E~dr0ztW^L4{Fow4;#<%M_<9Y2q3Ur+@f;~WmWiQ~;0uqS;6
z=nb}*tq}=#C6Sd4;RAQUMa{F@A>wvj%8*u0)ng-viv5)g`bDy=78~i$2e1wj2ew)n
zZDUhCB{Ud0Y0bFFH2cKy7b%Qr&W(fRl+ze)!*}`O<$=;;w3aT@V>CZ=q`6MBvVq$O
zJiz;>StFYyoJZIM;tC&ikIA9;4=-9!Ts$p7i61QZft+%~j^&0Hn8okKNC$hTIh>bF
zt09JqrkE3>t11Q%KZhAtGM=&^#8)wJH~LZf`X|)`{h}pjUq#s#B?z1m_IDACFhEH7
z`CW-#K#$&pgf||xsq4Xw+%-7*^aF*17D`V1P45-8I!JBCpg-;#GlH}p$dM{h=-e<f
zO<InUWUCx7*^7{t$`L4D9kX5%tB}r(mbT7|Ati1Ovh#31vRCBA9u&iR7l>Fa=rd<I
zmQE&&zDF2}f$`zTn8Z7yD%*SE6&g%p1sffs45mkRh7F2RMd>bjYR4=vig+Wj&9d}O
zH<>B;&;s2QMQmn6s|fq(oe_@mDY`@Jq8QC1Au@-KoG<YLR$YAub20g4YYg=T%}#=L
z{9VB}CtTZ%LpNh>EhML+jvA>}ue#4Q|Kt!vTVB3W_2sX8(f|<D3IwV|667W-waOak
zIU0q5CL-h=fkOf-Rb8BCLnowt&D95W?Qc@jTa-`-D~U;6*H>KyN5xs&hUZ<gqmOse
zcWtvZ>G2-G6(}>6tM}*5n;BZtQJptRN~Ep62s#Lip6ZoZ+M4>MTha~7r#Ht*Pm>Sb
zTcYE|JhAfYVP^hTr8SAVve;7hy5Na+aA?dJgP#Z=2b5q}orvk}a)g2;RkXc=vp{fK
zhg5;f(_8R`2<$#u{e#tlkGo>DKep9Pc8DabrqWgO$RLsj#j7cI?9e0^Z>ZO~`E(0N
z)~SV>i2W5-KCyrYZRA6P|L~pNz8`W6{k8<dhnySk<gaA%1Xfi)r)5fSmi{auKGiKK
z7i%W!I53iI3$)x^%c1z>O6TM~zpoR<d_~ecnsnW0`Q7;VX94DWReDN^RDVrX+FCEz
zz6687^<WY2G=>HdKDZ8H`NzK#_KT=Sy?`x2-34b-nsitqRRXxrMJE4uxVx3y@Zj2e
zjt~zc{tb!0tJnVyGQMc=^|r^UT@f()J0<(?w2yvQlxpU@TXY!z{hfb~forjc$T<&v
zF_F3aa|O%|z-?Bhh2oEM=x}TT?4`hUO#Z)LCmox;j6Yq+Hj(YWXZiacen@*kCbnni
zx_^64a4cj8J!UjvC;xFz%<u2u3Wlx*IOl)fn-NZ0c~n0om&et$wKe-UNy45%@k0d$
z9nIX2>|Sr0KgQ_E$WzD@6AU<;wp1>FT|x6b!QWl-2quy~cVR)45L|vD2})Ge@KK#?
zduL#uOPZ3BA`#C+kqyfYE@G<O7)Im`+0ofm%|DS0wyVx}MQ${1ma_r(KB|K1^g7W8
zPAO6dzU^#3{>xucMDb>!H*8Ph+Q_%l8g|#kS9#HN=8m}M`giyoSAE=F%jZr;ltOeD
z03|TJ^-a(vem1@Rp7kWEdexfsBctxmqX@E>ErZuv^$OX?{cp8Q>S);l1syc+FqnKO
zUw_wErP6*T*VHzpu}Pua%?KR>!ytHcvwZV<e|7C4&R5WSA(6mWmcI*TqfOg-MwE)T
z&S>d<jqE#pX+_@$WzF}59)Hn!0g;k@)w%rM!8}SVOPVK3xr}&Rxh6f2H(!r~!q58u
zM&v&uX}as0x(c;r_X5BdxH3JwAtfH-;l#QzAWl>xcfM^TXvuh&rkU}+9)F72SEa4}
z)4KOKYjXrO-|BE{4X$LryhD6;;J~wZegt)fv6m;jwZ4_F1AWgrdHNIdrVbBhnRY9U
ztmtl;hBq5bZCJkkSxtC!Q0teOU8f9D{Fb96@5a5Y1ht$qUblxL1mf>j@MWO)!ORAI
zdV2BgH;+n8<bT#WV4iG`;j8cTxZQeza+dWoJcK5b>m4fE%;}(hXRIK_Idcqoiu=i>
zIpT$CE!SYCSi^EtGQ?FHfosw;V_{m>WVDZmw*{Y|T-O@-p}<{NE$P3dKQ!BHmV#cf
z&WC7#5Q?+ANwDEk^kQ&|)u@cIx{$yHqoyZnpbSSy3x5XrrwS!O433sl??26n!7Yv5
z5T3VFn{}l__0L14NYCHC$Df2xVW<^ki9p3YC-`;1X7ohQml{8&xc5RFC@j=Va6jOX
z^dE0yUY<|17~brwQtRc<_n!yGmMfX|7qMU>H+?s|%w2YYAJ*(CzOXoHWHE&fBulZd
zKfR=7%Cox(*w*YBZ{jXzyCyC8p#R{rto0zQTx|0jFzw4K-4Gzo3AeZAjl5cCxvP20
zP7S4)-)3&qNRX%IErjzZ!z;~Cy85U)Z&iitm{!2!q}4!2`;XPh`e{RZvxL^Y_Ba-P
zy!Cp0)5s>HAr-cA1w4x3RM%+#==+AupLgOo!U>-~edj<{QN$@CD`p&l-z@XAshwL{
zevfc`yXHf0$PGi4h#~EBjA2S6rmyOs`Z5qso8w}>xUq%y+f=RjebweL%e2)sE}PrL
z-RBzTT$Y`@mlu{TF$~4}pQ$ao(_sV&kEMAKSh?=i8NIzXUa5wECZ+Ry0$U)5ROU#2
z54guT%$a|<pBLYnz)(>1s4-^%h!)9LoOy;IgT;z{RYr?8*k5vTM!u`D>AeTrg{_=s
zc=8H2p6z^VrWf$>sE@m~KJ)!}xYm~2SeB}wLON;krl|_Zt`DP%9bxqc@EXW{#a!AW
z{4=W2(#>uW&5o^0pVK?-uD%MGH!p@17zZ>;mPCFUP-bc8m9GR&ru)dxM8wu~L=?QU
z62!a*HM|<}qQnss6H_#VRjnvH|NHp{#Y3w}Rm?*E3QI4wCEc6lTtaJ;MWj2Am_bt}
zmqSfubxOesW7OW7C-GUfYiWO${YImxbe6`q_+`>>J&AZp*yB@E@&(b@%^R2pbHkx%
z)q&h*FmbPQiqonRC*gUv>5IZ-Ca+mun(1)JZ1&-ZE<F!gV?f4M<mClB%*zXg-uLq5
zOTH^nBASYMo0Hq$cRWd^Ye)%Y1At8D=UfEcBWNZn3{Z<tn<?W-oX26)NTGL7sL$kL
z=4K|`wpFqIW^ubKWAo~l&CFEsq;E0o2=Rn!cQK6i`m>Wfyhh$!ouKOLaVwOo$0*2w
zn5739-*upFHwiutDGE+G?~*i53sF#)xJy${s$d-Vk+YgkTw6TN_1Ob{2>sp%S@H}k
zhEtUuDtX6k%2ZPqbjyE{6@=Y*l0sWYN8Z^M-l@2u0n}L2<Hkd-n`Yr0ZQ*r^sV03w
zmDVIX5Z!4Sv%!tZTh6R|+}s`IQ<hU$HEp>wI}$9AAw}En1svyr$U~1l9~QxGPV%?&
zihZeHRwVIxWUYvu1%)$ZP(WJw-dC)%P$HH<!2H)xRQnhOKbT-p*t~+SuJwuiyd|Xo
z*2gzDSR9^{+?V#UprjQSO5~8PJhX$82IouQJi7MBsvwF&u8w$<Husb)i;~9SXkGz*
zd^fnmYCP)q2L-G7jVII^8IIzQo_QpTaNg86bK<ND5xD-#-Q*B&ZQYNxb4klPk}BH%
z?LA$D?N{iEGG<O;H%*>hju8#n7`G*~5DSKLf8-QJ;0QzcqhRsNX^1NGjb@HMRX4=2
z{V%uh*Pjyh-naG+a-LT#p#1TB8aN=|(9l&)y!FSM2mrYdVRK}e;-zma!bx=Tu+TyQ
zmOrj^A0@+)A%b}|{hw&}@2TFe7(oK}|8gCX+lmY_O$GIX9CIcO-QBEDn^NxHJ+L1L
z!Rk2h{^PZW*r0wA5aY`%xhCc*L;(<tSvR?Ksc7*Gnb@0TWM)Um`L^&!L%Y>Zw|AR{
z4h-6n1vQ$3f4nY9WoiZ2G(e+=KEvow%4yj3K_1<uZV;AZ20@^4EjB!LO{ui<Vwbh|
zG?>T~v##pOH^;=FPZ48DJ3mV^m6dWFzu|~m8sQ-qTk_QrDmGkWPA(Ol_i+HyufMuj
z_LhL`-AdUC&9i11_5Dp$39Y~|9vwdA91W_fH#IXLS9#>}wq92S@Du<Qp)l=Bdy?a*
zW1n!5G&s&Z_~Tpfdq0<3k803BeT|)_#~o8{e;t_31V&l%(`;?iJW6wVUTwdhrBshi
z+aQ<P_icTh;zg?5vw*{C%XvFn(fTKwsTw&!tx<xQKz!#X)-`r-?eNWfceolxlOy0l
z_cr>psoF&`dQ!zaKcQk=qoJj}eG!_0X%+jMm8GnukvsX$JMi^dKE(UYu2p?%OE``#
z>F@XGJ%2Bx6*AFijNZSa`wm{2=1gM8b~VXKEcUEye}x{leDB+Cw<Y<{d{b^jHA-am
zU}I3;>I^KGPnAtC%{3{Vcl16Aa^tIfMbyFJv1zMbgHF1?-*S%<z1zDl-BmLqrDc<)
zS_R%KCD$_K?gVb=UN7=MC_c2D`2Z+f4$Z(GA%|J4?j-&X8|#8at}Vu?E_MH7*uJF!
zv@pBiOi8Fsht?IeDN<7NQ311KP!GqQ5izRvm2QSJq#OVny1k|EOifztc9CCMjF$ET
ztCy;5ei9s&oD3J+a-VD-%@hbPPFJl23Kd#sp4Hl}+X=kAk^FA8(M9WVbJwa`Xd5F}
zT-KGNeHJ~a`zJ*sS%>ZGzrQUMoU~gPUzA5Zoy6rw%be}P4u%`QWo^+xdI9+mOT{BG
zO-HwEddhGB^B1z8?ntD&NIUPZ#d?$#75yyOnFF@)8OWVQ$z}gf9gT^8n`|8vckYBL
z$lB3E=EOoLEq1E|7To@rgY#@5S>b`$ndm>m`dAiJ=<oFN)6WK*tFeBgkG$@S4>#q@
zmN8g#-Hn5D`Ir%6TwdHI_EA5@jZ#ceYc@aXpfy-LCpf|Z4b3+;L_ZrggxtKJ-&eJO
zIIi-yC!Zho_70wzUCCge?1=fvm=gc}=<>od9f&i0F#{Jk6f4}Vmp|3a9xdmvN9J3i
z_bwU(0OEbFE3oZAOr8J_6eH$Riw8|_PdA@MxCbBrq3)NLmq$r8@l}>Vz-3QF{t<mk
z<h@{6*vL1(z!O|xhWWkS$a8h!<jLhVvQ4R>d1Pe5ZXi~m2N~HTMd=gC6@3kFW6Y=s
z&sks)>}ScGKlc=;7Vjd!aM!r?u4a99_&vlG+`lO8antl}2G=N1|F6~9I}4SPk}f0*
z=ze*;r7th-UZ{h#`rk!H<5)??{^3>si=WoIUV?qrXJmyKmxG1AC@OAR-m*av<nocN
zMGz6{56v5hf4|XN$zDXDW-b5f-;{BADm26sW6ixXv_2x(I=K9M`m(5B%EsdIiT}Jk
zNfA&@N>1M^#Qx(X!He5l(kx29d?W<@0u%7|Z=nC<_7GU$_7csTqAuT_2*C|~>I8IF
z)c8LtjKO>QqQUiKplppRw@9LW<+|@q{^m^m6DZf{KkXOZ{NwWKsH!0JDW-SOROD#o
zzG`;c=B|s`anCIe>=FxI-K}56tk<f;!gae7KT-9^B&DT6(GqXTP0gEeyQnuopXYSL
zWCB?I^H;93qVx0f19`}Yy&zJX(@`ULva%JPryrzXp+Zm^3#H8F@0iH#tr>S{eyyf%
zg@@9st|*|JOyo)^H|Zagi0`I!-XRv5@Ri*@`1x$S#))_Ih!TRpr$nFb^`6M!3#cwx
z>ipop)DsicGN5Xh`t*Z;>XXzcETwBFR>x%ihf>~HsO9CRTWcfze*{ShZSOCSOK2Qs
zDR&Te@-%Yrs+~sL7#}41396wuXj)7a<IS}Mi2xSfrYl^Ysuh%k2a~ly<U<Ae^9+Ov
zC34T+zeitPCx2-5iE&QYdymy=bHS%2m<qzTI}7h;2stG_Iioo{SjY575V34{6X)?8
z9M)gkvlY61N_SE4i{n!@Ji*u^=<JCTdO~qbW?+`Hc5;}u`9cv<F5R$sI!J9XQF)cH
zIdA~6b192Q!J*|wc_6hOBoj@Oc?~G&-UC_9%dw2IEcGhijSrN9W>|6wkKXMr$)&iu
z%7YwT0|T01e*<bWDZjh{yTMgQ=BJqcAUS+xfk&!2K<>ci;0o^A!Us_6XX$RbxJ0HO
z1-Q?b8I5&k>E@t#oWjX3lt4-DC#+Ht%s!43P}z9Vp}}IJ>}2~YsTf`)zrCdzm9QH>
z>EkbN?n)1?Ww;;uUQS2CqP$?;qwYEwH4mcBK7>r`=W3MQhObe)02}=JR~xmfHTxW+
zghZ^-v(!#6$0#75FR`f)m!1}-V%p62>Q4B(y*{^s<s=N1vS#oawX29V2zs7CTnf|I
zCd!CRRB&8ozS7Cohz_Z0oXtyS;r*c7nk;kY^1Z&1GG;s)`v<r{Es3peNqu_o6OC|Q
z@O*2#6Jp6?lFe`2isg!lIpNAI*t*j*I7lp?B)|c?>s_vZ>O=XRUS;j|D`v-e+b-S$
zJ<)D$Rxt;&&a#E_$$hAIY=51I8Fv)$Q@9($y+nme&fQ)5XVNdCNQhO^&Cyr%vb3m(
z!_skP+;qM}56c~@1*f#onEBG7f)tA9acLvpJ?i9zCest=Ol4Ia-kVoxaj_A0dsl+>
zfZ6Sl^9lQ4u6n@Q<1aH4t|64+P}5VXwW*Sc#zF1pm)CJ?)rQY45-sQq!RdAi!R=w6
zT3)T~=C8-^bxzU<kp<(JF_#6zo-MXu+}?6rqepz!PC6_?u8pF)9`98%R3*DA*smQC
z<5ZD+PdTmW<SjYSrN0+{IH$Kf0A=IM(%n_gj@Fh^kLjH1dV2ZFk_yz0haHm13k2G6
zv(l$RNBVD0<I>-rtv&V)Jdp_$&JPCDei^%&wl~t`DUy=?){<OOLxFI2uSv!#w+bcV
z70poQ*v^zOCUU*86Oxpw{UJN%Y{Jcc{qYU3$I1^jVK<68QC!PNje6wfgm?br={90b
zct#-uRh3yIi*mb+#*C)&{U2k{OXRl2mxPJbV2N-M!nywUsAilTl2D${dvY}-EZ(~&
z@(}FC#ugRwRfAo!DxqEXR~eSEwQDLX-D(XKv7APODD}<>Ks@*6@4D)0EZeN>Z<#%H
zD29N56#b?MU#Ot-BOKbSD`;@^1*3&uSKE(~Ug&)Q0;I^{nic!?z+d6b8=VNtkUAl`
zF86PQ{Fks8mT<*2EqsD*0bAkUYT=)^F7gxyfUXicgR+-DLz@hBtdKZgtPWiw-sQ}S
z_AUxQjZ^%;Wn7LpB7GzvuIv@u)cON;kreYPab$><{^oo6Brk3(n}AYoZMyQ%Ki+!?
zsF1>YoAi}_d7Qugq=sJucYZYVktOYNAw)|H3L$JAT%Heq{9K(#F@9PCr-|&5n)e?k
zqCB`+7^YFPJKq(|mf;rMXY`<ntQ_b!4jg94PWFd1A6kwG4IVcceFv@w)6h^u4$DD-
zlg(7N7Zoo{D%Z~XEX6&yx#`^nm(s^<(SG~7;H^tAqmZY`<vwd#dK45y3dY+#RhHux
z18zg*2GeLB7BT2hPidXxt|M0EQm~$9;wPOkp4h0C{Vw_4D8r@lz;Ks+(SN-FVg%oW
zHR)9E-|_06IG$OF^slsC$H5_D^^GedZ){_{M$B>on-yBT#!~iphhy_#;%V<(%VNzo
zG!h$>Dq>CTMEaZhROt&(yq^r$xKde7ZUq(xUHk3*dZ#_mC-N?(tIJ@iy>a{2M_`n8
zu{wjjoUa3K-gnTN@|33wE3Hv9404qG0i~wv+tW|3WDjQfD?==Rs!JYWq4onf&Dk7G
zQ{DmrjC0|^s^vmSgmE4pH8hn*TYJLZdjB)swbX|xzBqB9h193w*r9K=FGJdok!vwK
z8RE+r5@iGsQ}K;)t0Q%B{LP`U!R)d7Qt=(CSp*9)$4Cpm1RYIi@K2Aa_@NgmiVoVf
zHpH%uR-bxV;Z+6dRrIK+Cq*y2I3)^B+UERh&(;{BIu{6Z{!^7ZKrzP<L>W-XCQKV3
z@}Yg9$Z(7m;CX}#S4N6Wl%_h`)vI4SM>uHzo*2>Upyc4DiMt6<hN%i3$4h1@=kaLo
z&i6O!Cb%>r7adx2e0*p=M>F}HU|h=)F{;B0($U#{+AJfC@0yQl&2OPwPr$wEG7Ar9
zkT5jyt6%K-Hl9?cfa0tM^~5gov?7wx!bwXKbjNXZ#RN!q8X5w`Ioy^0Z}#ar%3A_v
zd(rokgMhp)z%ju^e?6Nn<}u>Uz^(;ldRJ5s1np=qXt?%eq*Z-sQyXLLDS^KA-x)}6
zi$!l1-4PyHM$c+&byaWO8@ATNv%S-Y6cV07aQ+Bp9ZGzvaX+M%Pocvcnapk8z5(4j
z$=fIZxf?*{#<NG3sQxyLrvtInCtewDdLBH^RxR+Ss!MnW$cn~gg=aP^KW=^zcEXt$
zb2UH)b!~0*V&QLK>d%c5E&nVk!sapG{}OYw@OlqENN^DX6Ryg_mN=IC^6PMT<WmhI
z<6Oo(Ci7&Dk-Juwqf;kcD+~T1EUtKN$c}q%kBm7%8<Jri*@VmW=W-?_G6|2!CZJ>n
zrz`0px_h8DWhsBm)6yB*FPa(WWU7Tf#*+twPQg`@S<;n|b(O15<fpEsPk0NizP(|C
z53#UB@WIzvb@B;-s2@)UR&}<u{%YQ)JKePjarGoL8P)Tw?#9nk>0Y!FyWgIj`U!e2
zQ;1b=v!FEf(Ohmp;mH(+?bXoj&Uj_E(ljUO>XLvbla-E-(|9!$lS`Itf*ca0NzT3H
z#c&&ewoxJZ#m!p5HNumvF-3`9rgVv-Fh2F3`3O>3<txCUhb<A1Ltuxn=A+x8ytVnw
z1|3~!rkimp{-JV+k7~J^*MMurb5;_yHC4!@M}<4$h$Vh7#xeRdQ2<*Mp?SSGKb052
z_W>_`Twi1Mi@80!yqFge6lM=tVar*nu$gCcY8W`!h4SKH<8iX!JiDDJ=xTPv{Djp)
zhRP5j)+`Vo>`KZ03f-la`!)!neUKSaE+esy@&s82jPV*^^ZJPLM=9?X$bb4XfkXvy
zJWvh^rPFdeJv)MRWFVHhzpz8=*Im)LGTps-)@uMfdUtu!mAyP$#C3;+Dz<!v{I}N%
zR>qHkA~6n~qn2OV<)>s}gqF?@Yu*o{yA3;<Va?fZF|snG?m<7XE=Sr9eiy#&=U!7`
zxUE+Yho-SyC$D%~hx%b}>6iLC8}>LlhwQt1*WQTYX;f6K<HyB7^bI5o-H=W?`g=7@
zdQUYn2llD3Y_GCFqevZD4R&TtYcZAHtd)7)9A<;+?d@%bB~t#Hfjk_+{9BCm;>K2Q
zn=8OojJ<E(ejvZKu$KggBOC21H<ajsH5e$zLkp5?@bHijjT)n<je{s^Zko5ii0Xxg
ztTFvuewY6q^HOW*HDK(8F*Z=1eSPUgxf@XglM-c1@cSNL_mkl#FtqXOebOwZgJsH6
zF8xuu)u#jvnr3fgS{@45r6W17Ij>g-BIZpL<qto@Wa8V>jQWD6JYzoyu4o4o^#edV
z!}5UsCHnsQWUv``_J!)^{bNq^-ysSDsRpKI338OATB#5L%N=z=enc-)+&mg#9+lmq
zFW6ETngp?JKp;3JCxTuK)QJfeYfp*?(R2-2YgVA{Jc1}B$-L)CiFS79%JlR;UU>|I
z9@Y62&6y;Zsi}S8e?u_kxtl&|(Y*%0V74B<9w*R~JH~b(=YbIhN#0;-QjAZ%(_h=Q
zxan~Hrl;Hfc8xmJjsquW&xy1IYO$S^u^YKPe~jD^QQJH_aM@2<i5(}}lbOdH;EZ}t
z6k_t6O{27P_LX7rm!1$gb<aV$UxvB&5ZjHb<R&IaiJMES!ZHT1`@wNxCj9mJ_fSd$
zgzH=m4N6s{s>{>fbj%xZ{#2X47yPX~wnH>HKB!hsNZjg;MUW{Z5k&lNtd^RHJL`Ea
zWt}&Kz*Z*Pu=nz^@X14*N}6!83QGaDF-1Y`D0>V*>E0weGWg=zXUVAbH&g%jXz`wZ
z0N@KwXN<l!q$2dBv+m12*Z2-e1IUAK<{BfSl;6b0$R=8{K$e*Y*&0Mfj|%Sg{F0P4
z9AVIglsnjW@{JzJe=q^95LTz!uhl9}TI0C+gD3>Orj|Mz!4@PR!)4GdEc>6wm<q*y
zA(r>~HPcb03*j=s+n3OS5g8gPm4e()X>Vbv?HA^k_T~kKU--GLIqV}z{2w3=qwWQL
z|M?v6#xHmF_n))04V3Ulwzh_sXR*Wx>dUoIxe>i9iT}ue{yX=FEI>7EcV`EGn@|@3
z{VWFH)o1Hb(f>ne{&|hV*8pn1uR0#~>y!O;EE#>6rmFzua#H$&8V?{Ob6!odmw_<q
z^lLW7MG<G$rw@O52Y+RuB6l!`X(+_mt$rO#e+?@}tp+nxIDpHOO*{4(_sy<*AfN3a
zNYDCqo!Y+;37?eT^6~Z9>a(1yeganDt<^^0=+yWizsBzOyxt47?Kw3rgm72Jj;}@^
z2!uEsW?!SDAGE-G0ixbg_JCxrRNiiM7%G8{j)_sX7xC^L<s6{L52m2IeU^IV-cFlO
zwk$@;CThu6WH%>juGNp#z1^BV>u_8+I!CvwdX#FgfK%vH7;FGq!{0+|kTZ+dr|z#-
z{`c}Po>L+lmFE+=gdaL4jUP^iaMF&T(AxsNFFx>?+q;VoK7xAup2Nxjz}FwJ>hTru
zvT2T^9pc<-JQL)9Q6{D%fPK9Qz<uIbO!AW_Ov4b!SP96jK!e&%hG44Z!;(yUYUkC(
z>vx1I#W$6J7-zmqi~1=ANZ*uNY+3@%)e22d+p!!vu6q%ffeqGzXEzeY?q`l3Y)<XU
zjNM|=zGKv()(lW#^^>8^j0FzpC-|2iZ~J{CLwLwVJ0GY(J_V2_6k2sDQoJT#ork@C
z7J@T?yw8vQLpnMSU2VZ&GlVj4)ZtsxuE_<&YcW}f6V3XCd!6+-ict-_CsFYG*AMk^
z0OAodOa+y%LQXz|n~GM2wT20^oN56PQ*=v^WsOY>+e%=d#YhQc^OX^^PN{%K0+;-6
zKt!9)1(cdjqWKp+V8TA})q!De+Zi8-_C>RmA=5AjLtWefqvPgqKs(GV6#yX1<EJQh
zxL#e*2Cq|uj`#57<*okC#(W=|uGzB>gKVs_da+4<O1|IQ9;qud41MFz7?Q7=N=f$6
zDh16HTc$<s;3|NA=Kyir8giGA_Vn;vh$5q&*Zpd(UlbEoWa9ioM@PQiD6cWBG=8T|
zKRg}R?_#HVD-TV3voy3i6Caae?r(hDc10Gy;j}J6KNMo>;#bP(TscY1jz_210!~)?
zZNj?<j_S8a@ncq~zG13yqO_5Jkj_+Nsifgu-Yc{s<t5TNf<rmvxCCqeG*EspS7S?&
z#xE<_aXFg*v~NCKNoVZIPYQAc7l`ZmxASLni<XhHH~RSbW>+H5-dewKY7O+7SH5%S
z&WouMD?2{A#NQY}#afZC!J$0wOhcpf0fr`B%l0%qyUf0Dbz+hb^p?R;^t$*GGhFE2
z3W1#^t4s6zHjQQ8@97R9EmDS@RwhZDPOVZsgL#-fRH0C!k3VD5((13{fI?JrDA(30
z*f+wFy$}@&Sn5gq%1FL9vqs4?msjZ~u1n?DmwSteClT;`H0RVhz{uoWDf6=$ny#bR
zZfpHkouAM2C{PxR#7<;%@=>T%)7jrD2vLmO8I;0t^bnp>B}>p^g9R}C4=HHX)1YDT
zHLU!ahbk`tsOvDFcnAN~sp^guoT$~jWzY86k-~L3xys!??sjhug@vWkvmld*m{Ii_
zT^g`K1bM>PK$C>Sn+1UVWxas-7MT~jobDn&eB970=2J+-{dJ{N{3!Ajvu~E^+ur*g
zu}0Z+34Aw`SG5p2i7$^4*9P*Z(DTL|V9*-Ys@<5C$i(4`&K_t&AEB!rMLiHm@FjOI
z%x3%8kRCsPrfBixajYYYc?n+cZ;o6IrV@NQl!#{U-nYvP83$AHC$v|Z<TNEG)PC7e
z94{t2H(9Z*A3}Z7Sf!Mu2o1tBv!1BM8xlB_8T+wEU;T!2s)eqCe0)F_P4W%fye=-0
ziVG6-^EmWWeW`bg(noFzFU^j}5?0!r;ZBnFsvsBRhYaEF0L(?yNfUoSS{zT-X58VW
zu|9h$ku<5WNuWf&nL|ztgeA`kJT|ARq^?C%3s+@0Y3<B${uX)~Trdc@%f|G>beC^Z
z1rHfo)hF;ws-LtMPzA)MxxP!vx;4k|QE`KefFOnSkQve{7TQzJ6!=)We9h%2A}2af
zg)jM```b2h$+?YHE?i)H_X0XvF}+D8gs0k<Mi+yNjU9ADU`o+2I54cOO|sr{xH7Ux
zqQ3pn!f?cLcbnUk_W6X&)_tX$z)6%RFRW-Z%r_Bqr+~e^C&pw}Q3u`|6fqWC+t`F`
zsPL56+W=$jeCg~`8%B<@ZO|WbksVhL>AI8~$sCokwLGts6N6qRl|t;%8$*@_`v{&(
zOI1V+am>V^e}tJ2wltSL=zWrYyJOe{z8)YOT2$M|uTyOQxPKAkw;a%D-jtNPt+|wp
zMiD0%6M+@4zcwGV-!_mO+Zd^0RAqJN_%z~uS`)%!$rpp!{sE?LmU`!LseF9`0)hV4
z>2=!qb<Y|S7e_M#3xdrdFb!9W#^QPNc_<8%rM^+}6_O9;ACdH3H8lhfcZQ*4T&=Ta
zEm@sqQEOdayiTg)LBM2jsJ4G$Av>(YWAp-wFjC$And-Z2f1Feo|M^~%6ojLHy^~jx
zcoPi`?QZyI4W?r4!IHls^8bN3gR~*7C5|n;AEQiYhZNvrV%W-aPS%r^*)50+g>VNV
zR!vmk!T7|3dmp(5pKCVes7n;^KrdV68RXKGwzdH|@;wVSE~jV()6oeRJmqi$qh8ao
zKEeld>gn&KH%pWjnX|?UNr4Nd@u(U-ZjJLCnG2FC8x6s%QJmwhhrY&nb5s!KGoc~7
zzmT;ODJ~_sS&kmFnd5cjKxFC}sEN3l97G3MNPr&St&iKX$ig{uAXmmO4fqrlTdku#
z(d#tLZZTF%tflh#7;L7e+~aapFi6u_ke5yDc+6pMkeB8a@L{oV)a;UDHQnJLiluX3
z>6|K*$2huZn{8GdGZQEJ&{7(&l0R1ADx3|=BAA;i$ldud{QB3?pQi8qTy|Y9o;3k)
zSa;!ZUtd4tlTv4Dcb!1w`qBg$`5>$K#8p{`p6orb4#TW~d&f<;65T=CeLFeP5_~5#
z0p)LN#Z8`1>8ZKe0TsPhX@o68w<TEUlu4<_vKq~%k=$|^bU14+I9GulsyH8`C`8I3
z(Pby7EvzZse8XD3hWTm1>JMA0Ws&0qr1)w)3Lw|NjZ>K{yQiMLwWVa^XV`T&x@v_T
zRFh4P!kJo?=D-$%EP>xte^Zx~ub7Kz*f>Dtz_d^5fHn&}L}4m`wh#l-Mc!M7J2i$E
zl!x8iN!sZtW_|Fs-sz1=!n|hnj@&s#1GBjcVfLo`9Pzq+u;cWcIFqOw$=T5^3Dnx|
z=x)zP-Qw38|0B|P1(uY!%GhSWuC#G|(wW$SYoyKfy>`|u2Aad8k^W-6eq!C*dmDZS
zW{sKZ6)vA3OtCYX^mE0^uW*Y4x}rpeYb7+1z^EPeCaeJ7^j$pg88?i7yj)Ucw`-3p
z{`B;e8f9_yzUNsD=}u+#X8mEGa>CwVrs7<qk*}3>y2S^k$_(SZ@_~5fk}t<cy21ND
zm5m186mCKi?dL`&qE;$OWfHAf2)ii+YuQGtS=OT!qen(Ya#F6&jND*^c`f~l(R%Y<
z=z<B_=tDeII@vN$aVt(R_R=)MvRO(jrL(t_g(z-}eX3xl(0ccypzcsbc9G~pWC1VT
zvSU&g%v8)1$93=MV=XX>{Sw^SdOCBAc25R<Uz5p%&RW^adyjl!>D#Yabn?GN2_K#7
z9lk;>VdMymMYuTIwyq_JvSIU$@yt%sn{5N<ljXatx{p##_M#@&2F!4QGkE;gSPvHh
zU4J`Uz&F8s$U4CD{D?wp0Ns$eO}b%_Cy?yv)<frnTRp!eTdMT`6fh&)hHsP#FAA8g
zrX|QP$vZ76*iMeyf~T$2_j=0zEgAoo7qreO<X8J7&&Z0r|NYm$YfDHPs2&p1STV`}
z07)dZr~?H1B#%*x9R4_~^g{nznvbdV=UKWJjO`i0|F~4d1uvVP^R4{fi~kELiV%=Y
z--gqAcn=HwI-CE>)HPA>(ER_tlKsW)+2><u{lTWFQtOLCCJdW<ya39Vn!LYu%rohH
z-haPi>c_juQ@_Tg1O;Mz!Gj6>pF<{<O%8vGB?oCjvLF+W6Li>*cHuU5?F1$%fa*=P
z#Iy!V8@9%}!)wH1fI*{S_TTs(!&cW!qEr`b<xm?<a$gx8<gQw|EugfyWyfY_OF?p(
zh4w1LdVkl!fQOs*(e1~|?59;Y#=>t4r~r67XMX^o<ldU|nn#WYS1uH0j(XVTyF~xi
z6H-u}yz0OZpi~Ba^j9zP|4E&(5TMw^$)0uu3x|vYx78%^P`-8}=v=y}VbY|G`~hux
zK|2l?8k1h=d4JI#XPaCUKGvh>DpMDlW+@f(d**|89y!ml<E>BS<%BJONYe-g^NX*_
z8n1db0#rKAf^5!6x%g5v^IRmNyPs4P0lSg6d&_qL`jXM}t(%nv=$O)1I}*QZOa%-V
zIiLYfdBw;s{OO9v$?{E}TpeFP_r}W6fPxATuNif!c4u8$P5?9i8>|l0?vYY4dpdei
z_KfdCUyiCxDrak6vvR&B667>@6p6KZS+(WGjYDfj&Ej2x-b)}+FU1aZ-*r*W*ChuE
zoKM(EfdR8D-^Pcrr<QeRK))f)Ghdkte)ep$|K-2ZBlmx#NB2SP$D*wNno<HFW4S(Z
z*lF=)D_#OthoO(9Rl!ybE7R2$hfK?JyOfDS?%D6wltZfjDSYmv3l{0T=u5pL=6*y6
zc0zq0GEF_4zV0LJd3<ws(Zdhepe*w)yFWCY#Otooewp(QIjF0{;e66ETyIiScawc5
z9J>|%h1{Fz%Ema9?VSn**l+;mUHau2fVVS5_yFgaF7((FJI$|7nCyCdsiHR$4OpFg
z6^)mBJCqrZmqGr}>{FeOFC-q{@$LQ^DKL1!P#dZ}fFGOkg+!4P3q2DS0RlGIQ6^LC
zhL^C%F^cqAY%nU5lK#N5WNT<Y=@V~nJ{C`aT^*Q!cU5e|e`#(?DpD&b)rdA=Wh_9^
z`)wt6_mRl&pFK&wimm$sJDNb{n<)|nxlkxtv-=JuUs<+KljmuMi<0?r;xfp6vZi<b
zRZkgG97wV4uUXT7&(UzWGhFiwS-3G-g)x~ObS5}9+ZO&}Aa{;5g~Ilf`di)9di?Ey
zOu_0h>ns<y;AEHet2eW;ad6)CXsvUsK<gy(TwvxW6?Ohjo)oPfoOU;Wmfi<QtM6&;
zf4R9IxbY0I9x9q{*c63M78>LiJUk#@UetIHLZumqBBl^EfoFoF$?<Av0$7!P%H`!5
zD;Em+RG_Qa#-gh2ufLX`op{13c(ghRcex&)L(NAbhP$3RMh6`MnK{>b$7MltuF~{%
zSswatrF-|K+Y9zsThdS1&2hRD9%EzAYTMO_4m-e#J(X?7#4_(Ytv?pY)Xyv`={N1T
z$rJG1??E)1K73YK##N&C(VG<#zF~`r{2V+p9lIrtJkLnpsjirhpgs1kr*~tvcvTWk
zKtjl~bp7~f%lM(?f!A=x=+c!FCI=lU@24MZ7x!$Hm=2~q&)zX)BL#RCK;gmnXsX<l
zWz=CMMXBz4qVSM|^ilPmZ-*=zyeg{n<N{C6CUWI13rs5msyg4#Owi-zvJSp$$)IYg
zOjoR>LqH8Hgtn9gCreD^8h_YEF&J>EwEyw=A{RsCI;aULx3}L)gdDAxZa2@W*LNSe
z2nfYLB1D^_^j-o$?P;1xML`cc5Ue~yq)oo7Kc|3pH#awz%4$!&_eB>UUhv@vw`W6!
zGsxSBQ_wu5rENS?JM5L6xb+&Mm~F&dl9as*Sy>QE<C#(r{4R#AU}-0jr0XdI`aw3v
z>x^>Wo$Cm5dmPol-^f_g!cI?vh15)kMYpCsyzpY4J$p8gVi^Jud*~{te`Hl8rY$2t
z5hL(#5kou&@EN`sV2m-MqFE6j8=dPVgy#2h<|GLr+~0heTWG++AP_9mdiPoq9<{?n
z7}Vwge4@YW?Rx$s^pNa<D8yxbYNWmGK9tGt;%N0bQu>@nHCDIF$BeYbJQG!cwCBM^
zTIBMj*mO?9npQtow?v31U&kAd1!Q0qBpW&QO9#X~^mzzcV<2@%u|`Hca$ix;&8c;R
zzgvl91$%{6#yw<S^?Xvu9Fh1cR=MjwkmBFAMpW8jf2~gxAl4a!wG0RQ#tl-8S4bzs
z3rj_@nrNz4X;SpNk|wdt_3~P4U;nGU+Z#FxPehdEoWaK0%t4<wyG3DzP(9!;;`f&>
z6BdJv7llcE5cQ~+F8ii<1gqA~3lYkk|I*&9KG8#|<h6*$*H(Bed<WNSNaI(B8X8(!
z)p~U>LyiY>C-}?r#Vd5t2HtCahsD5I%#t!(P>ZnmW8Firs}getOkxkUnnBzeLf<*a
zD`6_*<DpA{3a*^+o(&J{8WZ7PzdqQ~6~-N(UBbbnmS>sk0biX#tNB^BBqEczeT_9y
z*as&vdzFWbpHkT6hD!F(w~&`qtCUMeW_{eL=#2Q=#ZD3h%nwWp?9BqI6kg>zUN8zV
zOUcP15e4d9>gjrPO|@cqM_4Ze&%^8{M{1Jfu2E%My?UFY>nMplb7_A>5z?`?)ZoA7
zjYYJL_A4#{=;NH5g_7efdg-#!a>A6RD?fhPdhDshNX_tc%ntsTlA{X7R`OKd)_Chx
z?$(AXm=Y<#rfD22<i3+NDYqY4tSgu(X}m(ov%}T-0%cMPaU0^06SdMJP4qzFsvrKw
z&nHQf>K@C6by#Qlx^-EU_+@t-$REPKRf5Wfrd)=uZ$D$<NH)ey%eMA>X6Ytz$6QGi
zi*9nW8~%?7YY!NgRfnxzj%0n>ZA)HVnzdY^R_2jlD&avcXXzU(D0u=UqxbuCCG++z
z#&Nze(P<l#MDI&$6wqG@7k2|)s`+SUl4YJ*eT{*JZS#g`lavq!p74bZ;&bd+ug?4Z
z^ns#!k;N?DwVnF^Ncju4XX}^X@wll%30bQ(wx`*e$nc^EdcUUBAQx26yC_JG{Uv^y
z$<r8oHyY0m&<onAY6@$2e}b4K6HWZU9Bx6{qrwv<j%4aFaCGRvl=Sq_5w+rs*t;LB
zv_jgo*kkLVaoV@fxk5T*uF5<Z-%hKq*K>xZ#hd?afK5E!F?z{ts@7H|(<Pqx3@MhF
z&O+!T*<R}$s%utLYKkZ+Hgf)@<S}#HqRWs?chYtFVx+p)DoVLd7mK<$mqTOyy{Cw<
zu%tw7<l2*>u^6r2RV3K={;EVcL*#Dc(Q29k2vDh~#tNu(_Lohbk+5lqVH_TEz<2SB
zU=~s9YNlt={T{wrXQ(b>HrT!kq@(34+iE^X_96|?ngT^S<R?F%e0e)<`;V8y-?@D)
zJqmW3B?U!EkcTXyD2|t!I^3hJbAr>~aq<KMR`P{yHc5EtX|rxi#T~`Df`!MU1TiKm
z1^-u@cpCQ2ftn>a-Yd_NjQiD$>A2%1E~3Gls5O=g(=|;m=l+9K5mcN)aXu7V4enou
zxB=tzOp0%Lvz?aJuY}LPB$UN%iCwLKGyMNbl8^qNe3|>&WO?c1zo2fq5U_0Pp`iXz
z9%zHYp+(ex>~g*=^7%qt^FQg5N}%)%@+YqNo$k9Y;(d$tMzcnZ(gCkm=0DzD|4}Wr
z1k-Z`vp<>wFW;LNs?7SL)9)O@#c4OpLGwXN+-LI3cXkEi3VB*NvG3pQ1#-MdfQMEB
zNM-SKhXSa%=~@}xgbw+0)ptmMIVbt%5oZ1IT|2&|=7Xa1@4&M3>i`nI)W1FLaiuP9
zOESWtNTV0xsyE-g?%Ose9MrWq{#$u?QJu}+)#vuMhx9GX<h(NxuGa$iIL!*LMGzCr
zEN9vtJ&5A*4Sdv&8kY#jN1#^G&?Rk2-w>5b29`mue`XK@ZKWTUYsKpc?8xkaAFu}`
zG|a&rer|`?z$V4_Y)3wf(T9n!l9(vxYNPDq?JES`{+nBY#6PW57_|MJdJ3_}$fXY<
zZuB{Jdb!`(rpX0z`h%ky;TNevnT#RbGizUc`u<@sKq`OpiSD~?!1T{<r-~03I%>S1
zd<iKqSct>I+G_FT?zp$cK=n1J=Cv(8FhRv)2&NE&#UX5f+HY;7imv^vIN2rdssbu}
z6hW>vUjAZc_P$a+0U+>wMXz}V76%S2#4)e|A;2x81m^pC5Wdg1SUz2dPWz7{i7RFr
z-;-p$s1k6r82iBQ;q>(mv(~-^5ZZD^v1(EpQIPyT3MEyjJ6#lOXb5#d;}X~j$v0lh
z1DYL&W8m)V;UyExnKQl12)43M_89~gg+r_V<m8R1;`r0k(^;;5QwVs55Bw;RrPq4P
zCQZ^X6HTo^PVl9np&{QZ83#30=q!th{2K`gtiF*k0EPp-kMbUn&ZItFARDgWug$Ch
z{dD(p-|1+W=vMD72Lq?_8K9l1mIa*uk2PzCx#>C`my!!d7r<T30<He?I5cS`9Vt4z
z%dSL3BOLoN&VekO2P4P+p!9X}eiG+dIJ&eCFGY;?SFC^h5$|_Y{XW18RZ$+epF}Dx
z<}UXxusm97&wJOKqgn6DMkS!=z0gAAwk3DY%A|5cKuaAtX$qfU(Jn>55Rp)54K|xl
z)n6k~;{^cx^UVi_0idVs**T?UZ&!{t-it0aQyGU2N1#|${=C5hIzjGS7}ia}_Rdxo
zuJMIfj^_rNYV=2~t5BccxR6h<JXqGfwa&NS`vkPZaC0Q9@ehw?_?ABTjD84q!TKIt
zQup-2G)^=yryJrj8+Z>gOYofS3zD$fmHS6PL34^S9A|kTFSrO>k5FT}XNu%rwdbet
zTa-b+5vgylqpBhfa+<rwW`djI*-g%H_LjMBldye(LAzPazOq!fVb~t_IfKI8_p@2&
zHbC-W>MJt$b+ZHTl-(!If`M7iSDj4C5Xwb%?w1;8s2d>>R?*|m_H4ydmU{2eF;~}d
z$D&~@V}gJ?1d_`@FIT6)3Ff+ukusw64%Meoxg(*VStmjbW!oFdPqRm__JVN)-Umrs
z7o8D=*YOs-M0R(z<}^Ral;6x!>fbz^;z)P39;qZ7D$wPjD3Cd9cbP2~52pMod5!H6
zpYZ@n?Vj%?{P<R~h#N*ObJ_7hs1L{*@9$(MYcyk>m*}(79z<?8D872fE*Z_!t`m90
z@~zZ7(e3SdY7gSQHYb1i8X+0k*Zzt(^SGN`k<{b&8RYM9Ox}yeDNcW`R*~y^v?rO{
zml4f!MtGg9Oav%n9Hgpb;>zvddannIeUwwBn`Pv%@bDS|;~yyMGG2y0L<hTVjp?^%
zR=aN5&*wbnbR4yj5RDAVmUE4iV{Tz*3#0G;1Gw2HD*W1_*9Osr+M(3<#HPC%8-=m4
zMWRAMFANavQs7ffwiv_s`OS~s=G}u<n5t|s2Dj{Zm>1&xmHC>hp5?f{H|f#Itq6Cg
z62KC%CGwKiQDjoa!|z-;?O56PY4Xv6ILA&Bk(~6%1xqDoNYqB+M)wz?d<H2l{IuXZ
zqke<B6E9L7pY^9!%rA<ltH<DF_2jg5zUnM-wsq*pY*Fgqj9rs4-riW9kV58naDt|-
zkVMO<A0$|~xbJ0{h=EY7IPrG{W+AKhz#wdVYp}f}MlCB*o0NAPD3{L8-mn6fx(`6z
zPa~2p*fCeg=Zfryj6HL&rn$dWwBcT^2CWLyoTzr^70e%bg!EtPP6o~FA=Ij<JD|&w
zEN9PL#zB0TotSDchxFSN`D0bgW>BPkE^gVNh`$RNv(rVwaA(7=vO<<YZ2}X7b4ojb
zPOz<wk40t%CC+97r3`lSo#~1r1<Td1paRC`Kg8$C6j+I#BiE2TgZY{U)onKxlC?wh
zQI8!r#mmT44BSps-cfuZ`UQ^!izoJ9NLwFG&e@dmMf>;)_v;MfrHw2!IOr4qy4mn@
zdGrmnV!Bj1J$_9f#;(U;a6{O1nOR`<@+y}$=78G34?RxcG|4DRf7jLZAoKQN8+t+p
z)Eeo??X6~2c2=cJ1-5b1amk7C$STh{4+jZzlr%lBG^qK`PF)jq_qBrz9qkBP+`Z0x
zrdkdPJbEo_ZO#JVMS8#=unCAQRX)F!PM~L9a^BnWc-0mrJLCY=nS$S9Iu`{O{R<p$
zj$^}HwpN3=_FT>+v{9VJ_QFIJs4}A}^QM3Pt_>Yx)Sp{hvm#Ec>&~8%(c$EG%2qCa
zWW>`w^7>Qf#{^)i1gmlFRKGQ&()?tq&Vg(6;d0DM(2JkuN7RIVz&2Z4{wr~nl;luU
z;%n?&7NXd^aUBf_>!S|(CncrA(R6|r5@`oR+WT<s0G6-+B~r;EI0T^C)B6>PL}v18
zi<0b1Aooxj##n;?l8n$w0%1#7VRnliounww=iin*kTobqfaLO)LzQ#!WrX*J9?I3e
zZKC<J%LhW<p*I3>^<6%X{2#5vvn-&`h;Pz2_xC{Z_l1;dlm-?S+kUyZzalJHlt6N)
z7IOUi=mD$MX9AGieP!j9|Dz9f_5lzy*S#B0`r~;*u9&RLJt2wD{G-unn`An7Vw?BX
z^*<iy>jhZ+|MNN#B4*}~v_J$`s8i(jm%YA)Y<X`>BfC0Dw#5pR$9OHcq_(@wD$IJd
zS3t4Gkw<m1;RhPktq+#ir@_W?!zKSubx-~d<sN-h7j+X#T`|a7gceKILDn=%_GOSY
z%h+Wn(M1YFjBO;_*v7suqnnC|EHm~kOkxb0#XfxB?)Q00?)M+~&JXjv&-=`r&w0-|
zpYu8Ayl3$~2~0b28vEcsSOs$goXt}}1^GLmVU?>{J)4U$&876~e=0Kbl>fIhC}}(3
zJn*tl)~jh|wA%4Uh_FnA1rtDS+S}dy&c8f{VO<=Qw;?^Zx|bga0#THLJ$TfgrKr&~
z#Ad=ePM`06HG~=k9Av|&lPeRAr-0nMPDC4vLPniRmcmwLNVnXX_Z50`ymY&RsJosE
zbrP9Si~ej+9Z>e_baQ(RX!;&+<&R9O!qwfucXC|uzrO%5Vfo=Ul;&s#0y&Ad_Ot``
z+du089Xf*LygVZHm--zUfn&%2!^_VV4)*@#l{#)R!IaUnKC8qZLAunsHc#U1NZQW!
zpSN7f-GD<XRj${)5L$k13G4m@h%tY7UcUFaW}3lP=rxdrF5)pA3Cuc5Pa*%OiV7%o
zv;%6eo*6pN&g?-8c+JGWydW4~4O`jhEVy5tQMdMNy|@=h2LaA^LpmS+RtWG`(6eLJ
zD3aIA=u^599gw^@Gn!{u<Li0+pvUuL-wQbY3;L63)$H3*eZ8_FpeY9n7Z=6G!sn&f
z+w&Ip!+pM98Kp2VwUk2}&)VzkH;1mZdV)s1Z)%!${HMq+;rg+}_ob7jRSufzl8+cq
zoT%}~{YYZH&|GtFnB(NFTdF=Fk}Ryrhmna%+DP3$gzdsJpz(v6$@)HVlF9$&d)k}t
z({5E6k(qx*dYtgGVr7xV|G}DYf-h&!oVHOl<v*N@vnj%j-G|kp#mv}adHHyGpLj79
z9%pSl7S78n6Pb{(v;66uOh8gkWybQEksiM+;WR(TugDGLXU^bE<Q)DeJtObqBR{{C
zLs%ITizWl}ZYnB5(xqJ%zt2<T77GjilJ#7!(9BYN?WwA-E$cldke>y)Huw*5Ysj;G
zQzNmoOjG#?-7%J5Uxo4XDw4H9`xy7UyZb6^!&fn%l3KP>#?|8a+$TxuX+Aqq+=z{2
zx0qJD)vR&|sSIhJ4{MHdVDJcPtOTc)$`QouhU3udc5$q~fd05zf-5U8j}d#wCX!)w
zqy0OlC0azfv2No<MVANa_pLduK8!52s5Ds*nbscieX1#Wwb_f{2dQtYY5ntpv{`RK
zCS1k=V<#>Zwvut(V@<1Z6+Ycr^`5L={%U2UvH3Z-yh<WgZuvObA;4SbrONLQ#i$yd
zy{JVnzE2}Qo$j8`2)hDqo}(id_9AtX^JAyrVY^h>@m$fwN1&!u-TF}B)wFqF|91<e
zZEbKA-$1%{EpCpYc=V_Wmxk{)8fIR+=+IsT8ppguSowc2Iv@2LCyvllb+Wa%n3#yM
zPtg5{IwJ2%g~uq3T4yFB_S)&BQ)1s8$f;=)LQ~<9@G-`QN!G-S48shOo97R*!TEAR
z>ImeCgW8x|CD<vRW{ZxCFM)JXPSYLy)ep9bv79Y$o7LkxAPYaF;+_n>3TeBf>7QAV
zL)bAM>nD`^ryjnGeF{{t5LDA#4oVdO=~xVKKVn{G;Ln3nqI@L0iOpKAsVuLN`KJv2
zD~-zc82jMNKus3^0ipVr{~C{bJ}iAmD>=NtizEC4D&$K}jE4Y00YGIZ?aRV{N%@Z}
z76JO@F_6INM2ACwurH3d<PrYQ1%M~`syD!L_z74T(Xp}E^$UKJ8x4_77NlA7paRgw
zZCR(vd;FXe3&-VKn$O`V?pAYVZY|O!P5R#vJVL+6!WhlE`1Y+ThqPB_O-mjmO*+2O
zA(66j<6h$3S1)gTM9pJk<`UD=^a}puIYbVYHI%ZlPoD7=^Gmv@TN=<1SX$jivsY@S
zlCP>!naP!)N2@QTN>V-+C3WQMBh(tV(+PQ|WTWegAI$AL*GhT<m>}kz?>>SPS&d&v
z=%4;Cc-?F*dK+iIfvL$V_s`;sxaPK&^{$fzuxr;m2O0_Xq|t5MSMO=MTXwsVm#cjG
z<#Xc0JSHKDY4EawU`=g*|H!m;wET#8y*VG>h0f$#njdRAR;j%)_YVusU*Si_YJ=t$
z2=j^3#7_^aF&iZxbQAtK#b=Kvy=PatGZ`?1T-LT_DD+RJEP_pxp!N65cx3LSNI-cJ
z)E3p*3m=UA#bXXbH4tK9(Ql^qgf+}7e(dc{gy+Vh?5+CU6S#ICy>i`g)_)4??(R;O
zb?=c3Fs~1OV54Y;Zg=D~(lIe<@cD+t1%Ew%m|IgPj@{ARcD-E{+!_)qu)fS6i1v<(
zgW8h|?ux=3LoKsLAAdS~N#wd-Q~DD6mWoPv42U@@X6xzi;`jJ*Jw4qZeCU)}+q$jO
zR8I1QPxoha10Iw3`)3ZbxKJnj@sd^;<qIFVSd=DG>i&qB08CWG<+Bf~{;r^umFbK5
z(XWPwBxG)DX+;N@4att*f~RAk3gPDOLQA_}ejWMD(!YulIwbSFGp)+-n`~@j=Cr%3
zpK}H18L^Fz$3Yhx8%=#fq2kd8anGlZiJ7E#S8JlI%N|}nd*wL2o3r2K8Bg`!HwoRb
zE8%<^d15DQ4&N_6?*Z&j?ijYita}Oc5oyLg;s4Jc*t7YeVywpxQ>o(EGXaCP`%!=f
z3%~fLZTOA9?u6h^<|(h8Xt4Og))nLwu|YR@{SeUo6Z3d{#b|1ncG0QdH6w4saetbj
z2iVFi>L3vqd1oByEW_}Q_lj@*&H~0qbdQM4>%w<-4k5UE=?&HmY;&LeCr<wYR1RSQ
z6rhrV{n&3*1{RQ^lN$)l&ExwW*YKJ1*433WVIOK(e#i7pIsJ33o#dphL+d_)K92LL
z06!Qz`~aHad`whZ*sNEhpd?nXH-SYT_CO_keqlk|(y|OJaSM8YBNkWb_4+H>*x5yy
zqvoD8qR0XK>gwu=Sy>{B3-?`oIQ>)XOVA5FxvMW@+TD^p{M1ID5f)L)6IV<twoj$C
z?z-2qcxY)E80@+`>qXo|UStEE5w7%nA)uh3%B73?wjX&Dr0dx@$;QC}+iPcIyO1M?
z4anJNVLX7sv53bj6m`vx{+K$&JG7^&zz)^^*wa&qHwcSHq4Z!1zQWrD{q;Hzqr0nT
z1JiTFn(7JY?Na8^tePT?6OeSt6f+1h?)fu#ET_yFy^uK;sS{|;Tz)=2brgXoq;$~7
z($3D)6sdc_+~ED|7)49+wM}^X2zEa6SvhxbkyK?re}Ck&<IXPnxkZ!P=J1gQf1C=l
zA^(8xpi|lAdRM_x)wOG<dd{w4t3N*1Mc}`j`N?nP$4pm|%_Ih+Ga2cb`dgr5#<~#K
z)L!V;v@#6lEXjwK?+?5*L1Zr3?Je%?=f^cM|L3R(7n&hQ*JP!mHFHFl)MOwJ`Gz6f
z5=gl^8G_onaEK^*8hVA{G-%zUAL-P}WU3LEuF1`GfQbL@dy7<hbqpFl#2LHTxW(?9
zBhgg&T48&W<^_ztRv-h}T+P#a+HoN8<+k8uCGCe}d2iPVPE$>~|HbCw%o>qutmiB#
zCwimxtyDjd`j^PB8P}Cj{`s=g&Up2L&Y%Ot4%_+qy35c+qR&ov*$pwV_gU|*{iF$C
z=4kM~cJk)fiO^2$D}9=V3$Wf-3Rp$fWB2_WGmRt0R|C`%*NG|dDXn3atL;4Jc|379
z7lC(mS3>roqqVjr;9^PNKQG7)V0RE;-3@bOxTT)TgYeSvsymN_U@5y#6cz`43n`1z
zcT`=E7On<U?s80cKNpa6HXWFtTA>pnI@UX1mQcj!l<sDV7op0SgU$GX5JTJq`=mu-
zw_u4;$Sk}zY?{t#fMOHxBN`5E5o7wL#KO0Q`tpNL2W%P-<}cuB0y4rKEvk?D65ynH
z3RrtCvS1-O7aFDO?BGNu2cF(*+I+0i4xGa)fa&QGX6Urk*x>o($2n8(`-hi(+9=0$
z>XtTXEC+ns$1Zbgi@Yp6U)eS#60p@M2nq7Tmv~*-YEJx2XfqQZv}!eH8{aq;ty_cf
zEN|WxN0<|<poO|c{vzv{^$Q5)k<)DHf?CebI6}7XWMHf00gEquTfl?pE2FLV0N%2>
zJ6Pqu>NZH}-k~7IR|2&@Sa>5_u95AN&Yj^DMo^c<JWtI*WL*qu0qcCA1us}-JC1O$
zlLSlL1!6^(fA@jT3AJJ$mab4jGHQlj)}H^CGNLn91Cs!vh)MgQOR`rTBsilxU}KLG
zQV=z8pihLBBQC9up?ft6Cu-N%r^m()5_^TV;&;^VO|`+{#|ak{mPNE>ldb?$;>ESO
zuRct*1Lid$GL%HMPkxP%N!c|On>>}A)@CX0X8ipFR$qgrx)Qizmexj+YSe2TYziL1
zxF;>CP4f?iet#C&MrOxXON@NB^vk2}WcxZAcTD}!x@c0KHHjZ}v??W?Em;vc36J@u
z+Lc+DYVLt%>WK1PJF7jH7u5(~VN;uFS6rm5_%29ZMdSFh>Zi#SW|kacjg7L`d!<ZM
z#M6ai&wonp4uoFh*RbNByWy7b2fUxHK&~h70y!yu%B2^VJLWgB6J6tq)9~`D>ao;(
z<!&NczBhL~shmKZ^vf<XKJB*1IzDW<rK7DmaQ4KSl`%8NgRwGH_p~e(QPAGv)}vWq
zIOaZ5Sb6=?t^l4>@O76pr6Gp2-Da6sF1<gzX_V}a;*fNG*<fJxaY?H~#`y|(`#Y%W
zOHwj5haYK`AaQcI<ziUKW^1Bu&3er9=#+6`+U=|$8eM!GCEPX$Uy0bW;@<t@Jzxyk
zXU?0UtUDktUc7H|ZwBVMIFO$^af2!yutVIi3mXU*`8?=*&_pS`OOGh-w*%F=(*|-!
zPfjDn+}mUa^ER4t+A_73#M%N}ixvDg;sv!|SZu7^$ez!v0Q{I*?~IAC1u@ckY1%-k
zx@bTDYq>kAKGl+L0|s9))bt7JAg4Y4S^j|gjP>G3W5%C6QoTMoU=sx^+|HRa>ew`7
zyTL^mfd&1^0BwQ_0khMkk)uh%aou=n`AJN4^dDZ7PCu{DuzlgXV9z!?M~AKoxG_Sq
zwJEq{rcTW2uOP)|=m<+NdPkNp6za;(v~*LJ8kzo&g#bFkckQ8Ll+mOBzx?E`Nm>xI
z8-l@M;!=|4o`nV#`B0GI&a$tjS$*d?^%L5>J~0TjXW`IBEi1LG6}P_Hpm*S`Ub>yF
zVwcxwurxaB^e!3d7q`T9H;i=AslT}P`KznyIkq<V9F6=S7WTq_%1%$cavw4&x4@|N
z=I7sTW(KNH5yehD3~i9ac%>^-SMLl{HzWMIWSSpEuUKcvBZSg8fYA$^52bQI`5HO;
z*l)gsE;qrM0qS|?z}rB5t&+?JW`_XlDoFZPL|R{4Y%=^hSD71yCm_vn25UOR(fd%0
zcqs}?;5bSv=W^~Pj<uqIMAzxfj7Z-7<m4nL>2B|*O^RmD5OQxlIw{n*pX{JWDL}g9
zDZg-FFk1UUH4X%HzG!>N`U{R5s!IE=)vlYAHp}D<`@Hdz6PF`@ZKyZL#XV*>uX#tY
z!;JD#A@!>!6C7C{v>p;7Y)><k6kFshS=%PtaWO7&Xc3PHq?NOiyu5WRuW_DZeK4eC
z9w4W5jOlUjkt0mA+G;8WzNCh&LU|JF7glHI&4xrC$7p>L`6yc7)*U)Jr$l4OI0m~p
zhabji?I|-E!?@*geBL!yRNQ+M*4jF+2II)Zl=kuO$QdBqk*O(xM(d%~I&!`c$%Q4~
zQS*A&s;UU3xcJ7A=US*dB<UgH<4aqI;g!_RzXbzs1-?i&y<47~*}@foZ*{yqaCGj?
z7g|srnM_tI&sY=UQVg^hLW}MVb!3p5+zuX;RBh{pb+H_ItH31DpoU8r_{2u1zE^t>
z_}WL~VrUCchr)MP!6)hh1ak}aS6zo?OPB5BWh@~VovmpT^@1zcQg2)pBTqrk7qVi7
zxtsL4F$<`#3#Z#cRQEPNm7{0rKm^E;oX?5~;OU)h6*Ai|-P=4WTZDO|wcOvF2h&CA
ziyIT(q5GO3@;9o2DQg##44@d_tT-9>U4wK1Nqx@u5Xl`K^p<~`qI_XIReX|Y{wP`9
z#WA49d#YnU5i=Q;!RjLFy__s_J5}DIVEUTA(#Ta~X;<h2`{QcMR0rGb4DqP;=CqmE
zb6e{S?QxTI-|OE(e#H?s^_1IImXdHh9~)fC5ez&?Ax^NBdjS^#ROcJz_wlXYC!ALg
zW3|4`oH(1}+w_sa9psB7?AQ$4I3D35G+{mUs&p7kaGD-`6{rO(sO>LJ!Vt?C?1^1?
zhZB@M&agb`4l}{(=}i=md0;3oC=Hj3{R75RvbeGit)^;pi~;T>OvlYNddzd@+m{Fj
z#l}!U(}5}X+a!vL@0QUQs<UDZH*H1UI(ihOs7T99Hk6ocM%_u;ah%AOhI)4!(u86{
zQIsdR{gm1aa6%Z^@VnV}q3=ETFXmZ@>HVG1>Ty5S;MgM-BBVX4ag)@jvvYktA@685
zb%O7Jk+WcE{iS*TTCPu^ZLv8n-5x|KL7e*(q%%~y+ZQ~PTNpT4AzVOHAu1vHJK{ne
zH57dd#>Ta2*WZimQum(74%7sk<N$j<TbvPmr6kx5HhHLFPwgz7vUc5l$7#3J-X_go
zxJ@+y+G?U|%0!mL#e5!cLkln-K#Wx_4X_aO6|bZH<c9farfD2YR0Gq**K#eV6_uc>
z*ss>pAUR(0LP}h*QL+`hElX(1eTHQ;5A#=%`)ltE?(1`VvLurH;CxTMM6uu>x{E_~
z^)1`;C;CASqBpq$JyjP;#}s>l$Ys8ycirG*V{WV2!HgUrd?#(>_bQ=piV()F>lnRV
zP@G0rw4@=d%O%|WXca!$yl!OpX&!kq)C4WR7AmvmESmRAWgMaR73ixO6%1`ov^;}E
zCc_FW5arlA`YR)biR&S@a$$IK$xi9;&QiarVozgm-y&K9CK1KFBBS5ay)gWh475TD
zk(+##HD$5c#2I?29Y=V(vNsBGXlm{zN^?e<E*K%)ldC&`a7`))G1PA9^YX_~*>#-v
z_vf(CMmLDa$B#YIpjj4NRLi~gO$Ig>9~Z#m4d#Rofu<-FgW64u58QuCl;D0okn&Av
zVc<r~lGb31xJ0MpPwgMReJNX}xcJI9ry2RW0E|#c6$w9xreg4eR7XWxgS4-)fg^9h
zBB;6K1P;IP4cFn*C1312s&lTlq_{W`jv59tc&`P%sCk+I&vK9k#YSJ6Dx1DtZ$n$D
zKxGB?ZkyOI6J$gTjWmP~$Qa-<MkrSWf;Z@-kgZkspcq=q-{;?F6n)_lH{}H^lv+nm
zE+4@1hY;(=$~BR;bF;YaZqb!H=J?`g@jUW&b(-bHe+C?I7A!jHeHGcaRO<@AO$CE)
zwpa7LACR<C{Jel&8ED3M#5>=p9dCv;bk{=T<z7K##hjcj<GosT3iprrfR6p71>G@v
z^T+!r^zIh!U4hVoK`6sN$#cyRT}vYm*3C+(+S(#L&9SC1#U69_b187RgP<V?p$Zck
zd*A-4-7hu5>%o1T<aOio98O|cXZQyoi;)w1&CTf}S0>j|_T6|por{q#;>+8LJ9Pm#
zDd{$$7UK1zX+1@CFNR-NWGj=%<WEN1>`0vp2S^rvB>@TD&9X)`hdXO55`yU)A+>EA
zeEmqJ?hlCVQt!2z65NFMRPpRacs%FkEhcaE5m9t~N1%Y2Uyc~3)kTVEE2YgB$VJ5y
z)Gx*Vl3?YlCxP5?ExSC?)C`lkI(xhMA{D7=OYc}m{Di-en|@Mey8ja4TU$RfXiOVj
z@Mw7cZ&`+4?tHj4Yad9R2A)5D98+#}>Rbeg*mq8fm^Wi;ssCyETvnF26r`wU8igs)
zZ#^#$1`pS7Xbn>wWKSOi!QO{#qxei~SVrL9@(|w+@;uA;oiTO(63<^hE@*0M3Iq#|
zCdnNR7FhA}@mbu*aX+|2WZrXxoIDhLcfLI1_4KxnPmO@^t2}<Fj*hP8@8OR^2Kvg%
z%2|)I#jK0fK6!+H$OVUka<wecadC;MsSih6gPJ3ssz1{gW;uigi}D+NUXj~=IkxlI
zB7Pw9iIy8UB|w>t<t&Q0Dy4uF2?*HAa)dwmMe%>Hloih~o;sD>&|q?d4REG`vA^f)
z<t<cICuXDL-7T<1`hJ&1yt*2_7ac@bCoE{<E%eDo0#Bblr9O}SdO*~E#K5t_bg03i
zA#m)HKvZ#Wl@1>tANGTdo&%&Ns~2#-p=BO7E})@YaJZ+stZbS?VUu325F6+CJ!IbB
z#kVGxI_#?lCDM$gGOWRSN=0`J^f1W|@9lLr_ab_$pZJOqs%Z*4mC5e$qFwa^r6ZP8
zazg<|GutU@p00k?JP0wo=}=dFZ>5dsBsW1pbjDr#Y{w&+9naDGS@!5)0+(pr0I{;S
zntt#9&mS_w_IGy``oX5AY0e+kIb=h&^YZfZi{pHcR*Rd(-#fn%10sPFSR(B%{YC%f
P2=LKX*HtT1wSMwHd2Wgy

literal 0
HcmV?d00001

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 148f01bcce..f775bf58a8 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1593,7 +1593,6 @@ and a plethora of [plugins](https://plugins.jetbrains.com/).
 
 Spotless provides access to IntelliJ IDEA's command line formatter. 
 
-
 ```gradle
 spotless {
   format 'myFormatter', {
@@ -1601,8 +1600,8 @@ spotless {
     target 'src/main/**/*.java','jbang/*.java'
 
     idea()
-      .codeStyleSettingsPath('/path/to/config') // if you have custom formatting rules, see below for how to get them
-      .withDefaults(true) // Use the default code style settings when the code style is not defined for a file type (default: true)
+      .codeStyleSettingsPath('/path/to/config') // if you have custom formatting rules, see below for how to extract/reference them
+      .withDefaults(false) // Disable using default code style settings when no custom code style is defined for a file type (default: true)
 
     // if idea is not on your path, you must specify the path to the executable
     idea().binaryPath('/path/to/idea')
@@ -1611,7 +1610,7 @@ spotless {
 ```
 
 ### How to generate code style settings files
-TODO
+See [here](../INTELLIJ_IDEA_SCREENSHOTS.md) for an explanation on how to extract or reference existing code style files. 
 
 ### Limitations
 - Currently, only IntelliJ IDEA is supported - none of the other jetbrains IDE. Consider opening a PR if you want to change this.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index b27ddc4eab..b6c238940c 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -38,15 +38,15 @@ user@machine repo % mvn spotless:check
 - [**Quickstart**](#quickstart)
   - [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), [cleanthat](#cleanthat))
+- **Languages** // TODO add idea
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations), [cleanthat](#cleanthat),[IntelliiJ IDEA](#intellij-idea))
   - [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), [clang-format](#clang-format))
   - [Python](#python) ([black](#black))
   - [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
-  - [Sql](#sql) ([dbeaver](#dbeaver))
+  - [Sql](#sql) ([dbeaver](#dbeaver), [prettier](#prettier), [IntelliJ IDEA](#intellij-idea))
   - [Maven Pom](#maven-pom) ([sortPom](#sortpom))
   - [Markdown](#markdown) ([flexmark](#flexmark))
   - [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier), [ESLint](#eslint-typescript), [Biome](#biome))
@@ -61,6 +61,7 @@ user@machine repo % mvn spotless:check
     - [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)
     - [Biome](#biome) ([binary detection](#biome-binary), [config file](#biome-configuration-file), [input language](#biome-input-language))
+    - [IntelliJ IDEA](#intellij-idea)
 - **Language independent**
   - [Generic steps](#generic-steps)
   - [License header](#license-header) ([slurp year from git](#retroactively-slurp-years-from-git-history))
@@ -194,6 +195,7 @@ any other maven phase (i.e. compile) then it can be configured as below;
     <googleJavaFormat /> <!-- has its own section below -->
     <eclipse />          <!-- has its own section below -->
     <prettier />         <!-- has its own section below -->
+    <idea />             <!-- has its own section below -->
 
     <importOrder /> <!-- standard import order -->
     <importOrder>  <!-- or a custom ordering -->
@@ -665,6 +667,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 
     <dbeaver />  <!-- has its own section below -->
     <prettier /> <!-- has its own section below -->
+    <idea />     <!-- has its own section below -->
   </sql>
 </configuration>
 ```
@@ -1666,9 +1669,47 @@ The following languages are currently recognized:
 * `ts?` -- TypeScript, with or without JSX, depending on the file extension
 * `json` -- JSON
 
+## IntelliJ IDEA
+
+[homepage](https://www.jetbrains.com/idea/). [changelog](https://www.jetbrains.com/idea/whatsnew/).
+
+`IntelliJ IDEA` is a powerful IDE for java, kotlin and many more languages. There are [specific variants](https://www.jetbrains.com/products/) for almost any modern language
+and a plethora of [plugins](https://plugins.jetbrains.com/).
+
+Spotless provides access to IntelliJ IDEA's command line formatter.
+
+```xml
+<configuration>
+  <formats>
+    <format>
+      <includes>
+        <include>src/main/**/*.java</include>
+        <include>jbang/*.java</include>
+      </includes>
+
+      <idea>
+        <!-- if you have custom formatting rules, see below for how to extract/reference them -->
+        <codeStyleSettingsPath>/path/to/config</codeStyleSettingsPath>
+        <!-- disable using default code style settings when no custom code style is defined for a file type (default: true) -->
+        <withDefaults>false</withDefaults>
+        <!-- if idea is not on your path, you must specify the path to the executable -->
+        <binaryPath>/path/to/idea</binaryPath>
+      </idea>
+    </format>
+  </formats>
+</configuration>
+```
+
+### How to generate code style settings files
+See [here](../INTELLIJ_IDEA_SCREENSHOTS.md) for an explanation on how to extract or reference existing code style files.
+
+### Limitations
+- Currently, only IntelliJ IDEA is supported - none of the other jetbrains IDE. Consider opening a PR if you want to change this.
+- Launching IntelliJ IDEA from the command line is pretty expensive and as of now, we do this for each file. If you want to change this, consider opening a PR.
+
 ## 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:
+[Prettier](#prettier), [eclipse wtp](#eclipse-web-tools-platform), [IntelliJ IDEA](#intellij-idea) 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:
 
 ```xml
 <trimTrailingWhitespace /> <!-- trim trailing whitespaces -->

From 50e2589256943684356134261a17970411877e6e Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 25 Jun 2025 21:24:49 +0200
Subject: [PATCH 147/210] fix(mvn): pass developer root dir to maven tests

---
 .../spotless/generic/TestEnvVars.java         |  3 +++
 plugin-maven/build.gradle                     |  1 +
 .../diffplug/spotless/maven/generic/Idea.java |  6 ++---
 .../maven/MavenIntegrationHarness.java        | 10 +++++--
 .../diffplug/spotless/maven/MavenRunner.java  | 26 +++++++++++++++++--
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java b/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java
index c0966c511f..f341f09b99 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java
@@ -64,6 +64,9 @@ private static Stream<Path> candidateTestEnvLocations() {
 		if (System.getProperty("testenv.properties.path") != null) {
 			builder.add(Path.of(System.getProperty("testenv.properties.path")));
 		}
+		if (System.getProperty("spotlessProjectDir") != null) {
+			builder.add(Path.of(System.getProperty("spotlessProjectDir"), "testenv.properties"));
+		}
 		builder.add(
 				Path.of(System.getProperty("user.dir"), "testenv.properties"));
 		builder.add(
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index 7932d4a007..d8e5f90770 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -55,6 +55,7 @@ dependencies {
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
 	systemProperty 'spotlessMavenPluginVersion', project.version
+	systemProperty 'spotlessProjectDir', "${project.rootProject.projectDir}".toString()
 	dependsOn 'publishToMavenLocal'
 	dependsOn ':lib:publishToMavenLocal'
 	dependsOn ':lib-extra:publishToMavenLocal'
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
index 0e09b8f1a7..2c3b5587a3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Idea.java
@@ -28,16 +28,16 @@ public class Idea implements FormatterStepFactory {
 	private String binaryPath;
 
 	@Parameter
-	private String configPath;
+	private String codeStyleSettingsPath;
 
 	@Parameter
-	private Boolean withDefaults = false;
+	private Boolean withDefaults = true;
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		return IdeaStep.newBuilder(config.getFileLocator().getBuildDir())
 				.setUseDefaults(withDefaults)
-				.setCodeStyleSettingsPath(configPath)
+				.setCodeStyleSettingsPath(codeStyleSettingsPath)
 				.setBinaryPath(binaryPath)
 				.build();
 	}
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 0d0582e180..f3e1f30355 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-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.
@@ -213,9 +213,15 @@ protected void writePom(String[] executions, String[] configuration, String[] de
 	}
 
 	protected MavenRunner mavenRunner() throws IOException {
-		return MavenRunner.create()
+		MavenRunner mavenRunner = MavenRunner.create()
 				.withProjectDir(rootFolder())
 				.withRunner(runner);
+		System.getProperties().forEach((key, value) -> {
+			if (key instanceof String && ((String) key).startsWith("spotless") && value instanceof String) {
+				mavenRunner.withSystemProperty((String) key, (String) value);
+			}
+		});
+		return mavenRunner;
 	}
 
 	private static ProcessRunner runner;
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 c8d845f8a2..6e22fe5e31 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-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.
@@ -23,6 +23,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.ProcessRunner;
@@ -41,6 +43,7 @@ private MavenRunner() {}
 	private File projectDir;
 	private String[] args;
 	private Map<String, String> environment = new HashMap<>();
+	private Map<String, String> systemProperties = new HashMap<>();
 	private ProcessRunner runner;
 
 	public MavenRunner withProjectDir(File projectDir) {
@@ -64,12 +67,31 @@ public MavenRunner withRemoteDebug(int port) {
 		return this;
 	}
 
+	public MavenRunner withSystemProperty(String key, String value) {
+		systemProperties.put(key, value);
+		return this;
+	}
+
+	private Map<String, String> calculateEnvironment() {
+		Map<String, String> env = new HashMap<>(environment);
+		if (!systemProperties.isEmpty()) {
+			// add system properties as environment variables as MAVEN_OPTS or append if already there
+			String sysProps = systemProperties.entrySet().stream()
+					.map(entry -> String.format("-D%s=%s", entry.getKey(), entry.getValue()))
+					.collect(Collectors.joining(" "));
+			String mavenOpts = Stream.of(env.getOrDefault("MAVEN_OPTS", ""), sysProps)
+					.collect(Collectors.joining(" "));
+			env.put("MAVEN_OPTS", mavenOpts.trim());
+		}
+		return env;
+	}
+
 	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 = "-e " + String.join(" ", Arrays.asList(args));
-		return runner.shellWinUnix(projectDir, environment, "mvnw " + argsString, "./mvnw " + argsString);
+		return runner.shellWinUnix(projectDir, calculateEnvironment(), "mvnw " + argsString, "./mvnw " + argsString);
 	}
 
 	/** Runs the command and asserts that exit code is 0. */

From 3000ad8fcf38428b89ce4c2403446251720a04f0 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 29 Jun 2025 20:51:02 +0200
Subject: [PATCH 148/210] style: reformat with spotless

---
 .../diffplug/spotless/generic/IdeaStep.java   |  7 ++----
 .../gradle/spotless/FormatExtension.java      | 24 +++++++------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index fd975e4df4..e14e975cb5 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -84,8 +84,7 @@ public static final class IdeaStepBuilder {
 		private boolean useDefaults = true;
 		@Nonnull
 		private String binaryPath = IDEA_EXECUTABLE_DEFAULT;
-		@Nullable
-		private String codeStyleSettingsPath;
+		@Nullable private String codeStyleSettingsPath;
 		private final Map<String, String> ideaProperties = new HashMap<>();
 
 		@Nonnull
@@ -140,8 +139,7 @@ private static class State implements Serializable {
 
 		private final File uniqueBuildFolder;
 		private final String binaryPath;
-		@Nullable
-		private final String codeStyleSettingsPath;
+		@Nullable private final String codeStyleSettingsPath;
 		private final boolean withDefaults;
 		private final TreeMap<String, String> ideaProperties;
 
@@ -190,7 +188,6 @@ private static String pathToExe(String binaryPath) {
 		}
 
 		private static String macOsFix(String binaryPath) {
-
 			// on macOS, the binary is located in the .app bundle which might be invisible to the user
 			// we try need to append the path to the binary
 			File binary = new File(binaryPath);
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 3b96a85394..1216b15864 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
@@ -218,8 +218,7 @@ public void encoding(String charset) {
 	protected FileCollection target, targetExclude;
 
 	/** The value from which files will be excluded if their content contain it. */
-	@Nullable
-	protected String targetExcludeContentPattern = null;
+	@Nullable protected String targetExcludeContentPattern = null;
 
 	protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
 		String formatterStepName = formatterStep.getName();
@@ -687,17 +686,13 @@ 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;
+		@Nullable protected Object npmFile;
 
-		@Nullable
-		protected Object nodeFile;
+		@Nullable protected Object nodeFile;
 
-		@Nullable
-		protected Object npmInstallCache;
+		@Nullable protected Object npmInstallCache;
 
-		@Nullable
-		protected Object npmrcFile;
+		@Nullable protected Object npmrcFile;
 
 		protected Project project;
 
@@ -771,11 +766,9 @@ protected void replaceStep() {
 
 	public class PrettierConfig extends NpmStepConfig<PrettierConfig> {
 
-		@Nullable
-		Object prettierConfigFile;
+		@Nullable Object prettierConfigFile;
 
-		@Nullable
-		Map<String, Object> prettierConfig;
+		@Nullable Map<String, Object> prettierConfig;
 
 		final Map<String, String> devDependencies;
 
@@ -815,8 +808,7 @@ protected FormatterStep createStep() {
 	 * <code>format{ ... }</code>.
 	 */
 	public class BiomeGeneric extends BiomeStepConfig<BiomeGeneric> {
-		@Nullable
-		String language;
+		@Nullable String language;
 
 		/**
 		 * Creates a new Biome config that downloads the Biome executable for the given

From b7aed375c0be85b27a1d9774f50f683b58e92767 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Sun, 29 Jun 2025 20:51:13 +0200
Subject: [PATCH 149/210] docs: update with PR-reference

---
 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 2d82b3c711..938e3c385c 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
-* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
+* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
 ## [3.1.2] - 2025-05-27
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e5c37e06a1..121d9d922c 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 for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
+* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
 ## [7.0.4] - 2025-05-27
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 06d09cc81d..cab00b07af 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 `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020))
+* Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
 ## [2.44.5] - 2025-05-27

From b5e117eb56264c8225f86f871969b2b54e2b8742 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 30 Jun 2025 08:16:23 +0200
Subject: [PATCH 150/210] fix: correct pmd warnings

---
 .../com/diffplug/spotless/generic/IdeaStep.java     | 13 +++++++++----
 .../com/diffplug/spotless/generic/TestEnvVars.java  |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
index e14e975cb5..209a0d7560 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/IdeaStep.java
@@ -24,6 +24,7 @@
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
@@ -208,7 +209,7 @@ private static String macOsFix(String binaryPath) {
 		}
 
 		private static boolean isMacOs() {
-			return System.getProperty("os.name").toLowerCase().contains("mac");
+			return System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("mac");
 		}
 
 		private String format(IdeaStepFormatterCleanupResources ideaStepFormatterCleanupResources, String unix, File file) throws Exception {
@@ -244,10 +245,14 @@ private File createIdeaPropertiesFile() {
 				return ideaProps.toFile(); // only create if it does not exist
 			}
 
-			ThrowingEx.run(() -> Files.createDirectories(ideaProps.getParent()));
+			Path parent = ideaProps.getParent();
+			if (parent == null) {
+				throw new IllegalStateException(String.format("Parent directory for IDEA properties file %s cannot be null", ideaProps));
+			}
+			ThrowingEx.run(() -> Files.createDirectories(parent));
 
-			Path configPath = ideaProps.getParent().resolve("config");
-			Path systemPath = ideaProps.getParent().resolve("system");
+			Path configPath = parent.resolve("config");
+			Path systemPath = parent.resolve("system");
 
 			Properties properties = new Properties();
 			properties.putAll(ideaProperties);
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java b/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java
index f341f09b99..8845fe9c0d 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/TestEnvVars.java
@@ -20,6 +20,7 @@
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -70,7 +71,7 @@ private static Stream<Path> candidateTestEnvLocations() {
 		builder.add(
 				Path.of(System.getProperty("user.dir"), "testenv.properties"));
 		builder.add(
-				Path.of(System.getProperty("user.dir")).getParent().resolve("testenv.properties"));
+				Objects.requireNonNull(Path.of(System.getProperty("user.dir")).getParent()).resolve("testenv.properties"));
 		return builder.build();
 	}
 

From 044f98d88486f6c492927f6725109bacea051131 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 30 Jun 2025 16:25:08 +0200
Subject: [PATCH 151/210] docs: fix typo

---
 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 b6c238940c..212e16e48a 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** // TODO add idea
-  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations), [cleanthat](#cleanthat),[IntelliiJ IDEA](#intellij-idea))
+  - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations), [cleanthat](#cleanthat), [IntelliJ IDEA](#intellij-idea))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
   - [Scala](#scala) ([scalafmt](#scalafmt))

From 6c7ecf5322dfa6d04f952a4e4f96d05504ceedde Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 30 Jun 2025 16:26:46 +0200
Subject: [PATCH 152/210] chore: cleanups based on review

---
 plugin-maven/README.md                                          | 2 +-
 .../test/java/com/diffplug/spotless/generic/IdeaStepTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 212e16e48a..2e5839e819 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -38,7 +38,7 @@ user@machine repo % mvn spotless:check
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
   - [Binding to maven phase](#binding-to-maven-phase)
-- **Languages** // TODO add idea
+- **Languages**
   - [Java](#java) ([google-java-format](#google-java-format), [eclipse jdt](#eclipse-jdt), [prettier](#prettier), [palantir-java-format](#palantir-java-format), [formatAnnotations](#formatAnnotations), [cleanthat](#cleanthat), [IntelliJ IDEA](#intellij-idea))
   - [Groovy](#groovy) ([eclipse groovy](#eclipse-groovy))
   - [Kotlin](#kotlin) ([ktfmt](#ktfmt), [ktlint](#ktlint), [diktat](#diktat), [prettier](#prettier))
diff --git a/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
index fad95e10f4..299ea4e45f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/generic/IdeaStepTest.java
@@ -79,7 +79,7 @@ void formattingsWorkWithDefaultParameters() throws Exception {
 	}
 
 	@Test
-	void formattingsWithOutDefaultDoesNothing() throws Exception {
+	void formattingsWithoutDefaultDoesNothing() throws Exception {
 		File dirtyFile = newFile("dirty.java");
 		String dirtyJava = ResourceHarness.getTestResource("java/idea/full.dirty.java");
 		Files.write(dirtyJava, dirtyFile, StandardCharsets.UTF_8);

From 9ed6289f33bad4982fa4769ec1573f008890969f Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 1 Jul 2025 12:57:15 +0200
Subject: [PATCH 153/210] Remove BiomeFlavor enum

We only support biome (not rome) anymore, so the enum serves no purpose.
---
 .../biome/BiomeExecutableDownloader.java      |  8 +--
 .../{BiomeFlavor.java => BiomeSettings.java}  | 45 ++++++----------
 .../diffplug/spotless/biome/BiomeStep.java    | 36 +++++--------
 .../gradle/spotless/BiomeStepConfig.java      | 18 ++-----
 .../gradle/spotless/CssExtension.java         |  4 +-
 .../gradle/spotless/FormatExtension.java      |  5 +-
 .../gradle/spotless/JavascriptExtension.java  |  3 +-
 .../gradle/spotless/JsonExtension.java        |  3 +-
 .../gradle/spotless/TypescriptExtension.java  |  3 +-
 .../diffplug/spotless/maven/css/BiomeCss.java |  3 +-
 .../spotless/maven/generic/AbstractBiome.java | 18 +++----
 .../spotless/maven/generic/Biome.java         |  4 +-
 .../spotless/maven/javascript/BiomeJs.java    |  3 +-
 .../spotless/maven/json/BiomeJson.java        |  3 +-
 .../spotless/maven/typescript/BiomeTs.java    |  3 +-
 .../spotless/biome/BiomeStepTest.java         | 54 +++++++++----------
 16 files changed, 80 insertions(+), 133 deletions(-)
 rename lib/src/main/java/com/diffplug/spotless/biome/{BiomeFlavor.java => BiomeSettings.java} (53%)

diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
index c01d11a20c..2bf02f3efb 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
@@ -71,17 +71,13 @@ final class BiomeExecutableDownloader {
 
 	private final Path downloadDir;
 
-	private final BiomeFlavor flavor;
-
 	/**
 	 * Creates a new downloader for the Biome executable. The executable files are
 	 * stored in the given download directory.
 	 *
-	 * @param flavor Flavor of Biome to use.
 	 * @param downloadDir Directory where to store the downloaded executable.
 	 */
-	public BiomeExecutableDownloader(BiomeFlavor flavor, Path downloadDir) {
-		this.flavor = flavor;
+	public BiomeExecutableDownloader(Path downloadDir) {
 		this.downloadDir = downloadDir;
 	}
 
@@ -240,7 +236,7 @@ private String computeChecksum(Path file, String algorithm) throws IOException {
 	 * Finds the code name for the given operating system used by the Biome
 	 * executable download URL.
 	 *
-	 * @param os Desired operating system.
+	 * @param architecture Desired operating system architecture.
 	 * @return Code name for the Biome download URL.
 	 * @throws IOException When the given OS is not supported by Biome.
 	 */
diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeFlavor.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
similarity index 53%
rename from lib/src/main/java/com/diffplug/spotless/biome/BiomeFlavor.java
rename to lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
index bcb065edea..c2f7028bc5 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeFlavor.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
@@ -16,52 +16,38 @@
 package com.diffplug.spotless.biome;
 
 /**
- * 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.
+ * Settings and constants for Biome to use.
  */
-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");
+public final class BiomeSettings {
+	private final static String configName= "biome.json";
+	private final static String defaultVersion = "1.2.0";
+	private final static String downloadFilePattern = "biome-%s-%s-%s";
+	private final static String shortName = "biome";
+	private final static String urlPattern = "https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s";
 
-	private final String configName;
-	private final String defaultVersion;
-	private final String downloadFilePattern;
-	private final String shortName;
-	private final String urlPattern;
-
-	BiomeFlavor(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;
-	}
+	private BiomeSettings() {}
 
 	/**
 	 * @return The name of the default config file.
 	 */
-	public String configName() {
+	public static String configName() {
 		return configName;
 	}
 
 	/**
 	 * @return Default version to use when no version was set explicitly.
 	 */
-	public String defaultVersion() {
+	public static 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,
+	 *         certain version and architecture. The first parameter is the platform,
 	 *         the second is the OS, the third is the architecture.
 	 */
-	public String getDownloadFilePattern() {
+	public static String getDownloadFilePattern() {
 		return downloadFilePattern;
 	}
 
@@ -71,15 +57,14 @@ public String getDownloadFilePattern() {
 	 *         The first parameter is the version, the second parameter is the OS /
 	 *         platform.
 	 */
-	public String getUrlPattern() {
+	public static String getUrlPattern() {
 		return urlPattern;
 	}
 
 	/**
-	 * @return The short name of this flavor, i.e. <code>rome</code> or
-	 *         <code>biome</code>.
+	 * @return The short name of this flavor, e.g. <code>biome</code>.
 	 */
-	public String shortName() {
+	public static String shortName() {
 		return shortName;
 	}
 }
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 09a42ae4a0..b95068de70 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
@@ -72,12 +72,6 @@ public class BiomeStep {
 	 */
 	private String language;
 
-	/**
-	 * Biome flavor to use. Will be removed once we stop supporting the deprecated Rome project.
-	 */
-	@Deprecated
-	private final BiomeFlavor 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
@@ -103,32 +97,30 @@ public class BiomeStep {
 	 * @return The name of this format step, i.e. <code>biome</code> or <code>rome</code>.
 	 */
 	public String name() {
-		return flavor.shortName();
+		return BiomeSettings.shortName();
 	}
 
 	/**
 	 * Creates a Biome step that format code by downloading to the given Biome
 	 * version. The executable is downloaded from the network.
 	 *
-	 * @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 Biome step that download the executable from the network.
 	 */
-	public static BiomeStep withExeDownload(BiomeFlavor flavor, String version, String downloadDir) {
-		return new BiomeStep(flavor, version, null, downloadDir);
+	public static BiomeStep withExeDownload(String version, String downloadDir) {
+		return new BiomeStep(version, null, downloadDir);
 	}
 
 	/**
 	 * Creates a Biome step that formats code by delegating to the Biome executable
 	 * located at the given path.
 	 *
-	 * @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 BiomeStep withExePath(BiomeFlavor flavor, String pathToExe) {
-		return new BiomeStep(flavor, null, pathToExe, null);
+	public static BiomeStep withExePath(String pathToExe) {
+		return new BiomeStep(null, pathToExe, null);
 	}
 
 	/**
@@ -156,8 +148,8 @@ private static void attemptToAddPosixPermission(Path file, PosixFilePermission p
 	 *
 	 * @return The default version for Biome.
 	 */
-	private static String defaultVersion(BiomeFlavor flavor) {
-		return flavor.defaultVersion();
+	private static String defaultVersion() {
+		return BiomeSettings.defaultVersion();
 	}
 
 	/**
@@ -200,12 +192,12 @@ 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(BiomeFlavor flavor, String configPath) {
+	private static void validateBiomeConfigPath(String configPath) {
 		if (configPath == null) {
 			return;
 		}
 		var path = Paths.get(configPath);
-		var config = path.resolve(flavor.configName());
+		var config = path.resolve(BiomeSettings.configName());
 		if (!Files.exists(path)) {
 			throw new IllegalArgumentException("Biome config directory does not exist: " + path);
 		}
@@ -227,14 +219,12 @@ private static void validateBiomeExecutable(String resolvedPathToExe) {
 	/**
 	 * Creates a new Biome step with the configuration from the given builder.
 	 *
-	 * @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 BiomeStep(BiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
-		this.flavor = flavor;
-		this.version = version != null && !version.isBlank() ? version : defaultVersion(flavor);
+	private BiomeStep(String version, String pathToExe, String downloadDir) {
+		this.version = version != null && !version.isBlank() ? version : defaultVersion();
 		this.pathToExe = pathToExe;
 		this.downloadDir = downloadDir;
 	}
@@ -306,7 +296,7 @@ public BiomeStep withLanguage(String language) {
 	private State createState() throws IOException, InterruptedException {
 		var resolvedPathToExe = resolveExe();
 		validateBiomeExecutable(resolvedPathToExe);
-		validateBiomeConfigPath(flavor, configPath);
+		validateBiomeConfigPath(configPath);
 		logger.debug("Using Biome executable located at  '{}'", resolvedPathToExe);
 		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
 		makeExecutable(resolvedPathToExe);
@@ -337,7 +327,7 @@ private String resolveExe() throws IOException, InterruptedException {
 				return pathToExe;
 			}
 		} else {
-			var downloader = new BiomeExecutableDownloader(flavor, Paths.get(downloadDir));
+			var downloader = new BiomeExecutableDownloader(Paths.get(downloadDir));
 			var downloaded = downloader.ensureDownloaded(version).toString();
 			makeExecutable(downloaded);
 			return downloaded;
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 776c844d9b..992b5b393f 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
@@ -23,10 +23,10 @@
 
 import javax.annotation.Nullable;
 
+import com.diffplug.spotless.biome.BiomeSettings;
 import org.gradle.api.Project;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.biome.BiomeStep;
 
 public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
@@ -48,12 +48,6 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	@Nullable
 	private Object downloadDir;
 
-	/**
-	 * The flavor of Biome to use. Will be removed when we stop support the
-	 * deprecated Rome project.
-	 */
-	private final BiomeFlavor 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
@@ -93,11 +87,9 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	@Nullable
 	private String version;
 
-	protected BiomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, BiomeFlavor flavor,
-			String version) {
+	protected BiomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, String version) {
 		this.project = requireNonNull(project);
 		this.replaceStep = requireNonNull(replaceStep);
-		this.flavor = flavor;
 		this.version = version;
 	}
 
@@ -224,10 +216,10 @@ private File findDataDir() {
 	private BiomeStep newBuilder() {
 		if (pathToExe != null) {
 			var resolvedPathToExe = resolvePathToExe();
-			return BiomeStep.withExePath(flavor, resolvedPathToExe);
+			return BiomeStep.withExePath(resolvedPathToExe);
 		} else {
 			var downloadDir = resolveDownloadDir();
-			return BiomeStep.withExeDownload(flavor, version, downloadDir);
+			return BiomeStep.withExeDownload(version, downloadDir);
 		}
 	}
 
@@ -260,7 +252,7 @@ private String resolveDownloadDir() {
 		if (downloadDir != null) {
 			return project.file(downloadDir).toString();
 		} else {
-			return findDataDir().toPath().resolve(flavor.shortName()).toString();
+			return findDataDir().toPath().resolve(BiomeSettings.shortName()).toString();
 		}
 	}
 }
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
index f3dd15ccb3..f1e844e153 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java
@@ -17,8 +17,6 @@
 
 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";
@@ -73,7 +71,7 @@ public class BiomeCss extends BiomeStepConfig<BiomeCss> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeCss(String version) {
-			super(getProject(), CssExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), CssExtension.this::replaceStep, version);
 		}
 
 		@Override
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 40069850c5..d0ea378958 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
@@ -59,7 +59,6 @@
 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;
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
@@ -825,13 +824,13 @@ public class BiomeGeneric extends BiomeStepConfig<BiomeGeneric> {
 		 *                <code>null</code>.
 		 */
 		public BiomeGeneric(String version) {
-			super(getProject(), FormatExtension.this::replaceStep, BiomeFlavor.BIOME, 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 Biome:
+		 * from the file name. Currently, the following languages are supported by Biome:
 		 * <ul>
 		 * <li>js (JavaScript)</li>
 		 * <li>jsx (JavaScript + JSX)</li>
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 5532045bc2..6d329cfb51 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,7 +30,6 @@
 
 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;
@@ -169,7 +168,7 @@ public class BiomeJs extends BiomeStepConfig<BiomeJs> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeJs(String version) {
-			super(getProject(), JavascriptExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), JavascriptExtension.this::replaceStep, 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 47db97b2e6..063e1d8ae9 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,7 +22,6 @@
 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;
@@ -192,7 +191,7 @@ public class BiomeJson extends BiomeStepConfig<BiomeJson> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeJson(String version) {
-			super(getProject(), JsonExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), JsonExtension.this::replaceStep, version);
 		}
 
 		@Override
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 39e050d51e..e227cfb790 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,7 +30,6 @@
 
 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;
@@ -254,7 +253,7 @@ public class BiomeTs extends BiomeStepConfig<BiomeTs> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeTs(String version) {
-			super(getProject(), TypescriptExtension.this::replaceStep, BiomeFlavor.BIOME, version);
+			super(getProject(), TypescriptExtension.this::replaceStep, version);
 		}
 
 		@Override
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
index ca96f47cfe..dc45ecbead 100644
--- 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
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.maven.css;
 
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.maven.generic.AbstractBiome;
 
 /**
@@ -23,7 +22,7 @@
  */
 public class BiomeCss extends AbstractBiome {
 	public BiomeCss() {
-		super(BiomeFlavor.BIOME);
+		super();
 	}
 
 	@Override
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 f1473adf45..1ca39af989 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
@@ -17,28 +17,24 @@
 
 import java.nio.file.Paths;
 
+import com.diffplug.spotless.biome.BiomeSettings;
 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;
 
 /**
- * Factory for creating the Biome formatter step that can format format code in
- * various types of language with Biome. Currently Biome supports JavaScript,
+ * Factory for creating the Biome formatter step that can 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 AbstractBiome implements FormatterStepFactory {
-	/** Biome flavor to use. */
-	private BiomeFlavor flavor;
 
-	protected AbstractBiome(BiomeFlavor flavor) {
-		this.flavor = flavor;
-	}
+	protected AbstractBiome() {}
 
 	/**
 	 * Optional path to the directory with configuration file for Biome. The file
@@ -138,10 +134,10 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	private BiomeStep newBuilder(FormatterStepConfig config) {
 		if (pathToExe != null) {
 			var resolvedExePath = resolveExePath(config);
-			return BiomeStep.withExePath(flavor, resolvedExePath);
+			return BiomeStep.withExePath(resolvedExePath);
 		} else {
 			var downloadDir = resolveDownloadDir(config);
-			return BiomeStep.withExeDownload(flavor, version, downloadDir);
+			return BiomeStep.withExeDownload(version, downloadDir);
 		}
 	}
 
@@ -190,7 +186,7 @@ private String resolveDownloadDir(FormatterStepConfig config) {
 		if (downloadDir != null && !downloadDir.isBlank()) {
 			return fileLocator.getBaseDir().toPath().resolve(downloadDir).toAbsolutePath().toString();
 		} else {
-			return fileLocator.getDataDir().toPath().resolve(flavor.shortName()).toString();
+			return fileLocator.getDataDir().toPath().resolve(BiomeSettings.shortName()).toString();
 		}
 	}
 }
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 99cede1065..873dc1506a 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
@@ -17,8 +17,6 @@
 
 import org.apache.maven.plugins.annotations.Parameter;
 
-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
@@ -26,7 +24,7 @@
  */
 public class Biome extends AbstractBiome {
 	public Biome() {
-		super(BiomeFlavor.BIOME);
+		super();
 	}
 
 	/**
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 b610a5b63b..82abf05592 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
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.maven.javascript;
 
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.maven.generic.AbstractBiome;
 
 /**
@@ -23,7 +22,7 @@
  */
 public class BiomeJs extends AbstractBiome {
 	public BiomeJs() {
-		super(BiomeFlavor.BIOME);
+		super();
 	}
 
 	@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 f52b490d69..046cc51e1d 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
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.maven.json;
 
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.maven.generic.AbstractBiome;
 
 /**
@@ -23,7 +22,7 @@
  */
 public class BiomeJson extends AbstractBiome {
 	public BiomeJson() {
-		super(BiomeFlavor.BIOME);
+		super();
 	}
 
 	@Override
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 e9f84d9edb..385dc3bb31 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
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.maven.typescript;
 
-import com.diffplug.spotless.biome.BiomeFlavor;
 import com.diffplug.spotless.maven.generic.AbstractBiome;
 
 /**
@@ -23,7 +22,7 @@
  */
 public class BiomeTs extends AbstractBiome {
 	public BiomeTs() {
-		super(BiomeFlavor.BIOME);
+		super();
 	}
 
 	@Override
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 87c4d6e91f..462dbaed4f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
@@ -53,7 +53,7 @@ class AutoDetectLanguage {
 		 */
 		@Test
 		void testAutoDetectCjs() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
 		}
@@ -64,7 +64,7 @@ void testAutoDetectCjs() {
 		 */
 		@Test
 		void testAutoDetectCts() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
 		}
@@ -76,7 +76,7 @@ void testAutoDetectCts() {
 		@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 step = BiomeStep.withExeDownload("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");
 		}
@@ -87,7 +87,7 @@ void testAutoDetectCssExperimental() {
 		 */
 		@Test
 		void testAutoDetectCssStable() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.9.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.9.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
 		}
@@ -98,7 +98,7 @@ void testAutoDetectCssStable() {
 		 */
 		@Test
 		void testAutoDetectJs() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
 		}
@@ -109,7 +109,7 @@ void testAutoDetectJs() {
 		 */
 		@Test
 		void testAutoDetectJson() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
 		}
@@ -120,7 +120,7 @@ void testAutoDetectJson() {
 		 */
 		@Test
 		void testAutoDetectJsonc() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/jsonc/fileBefore.jsonc", "biome/jsonc/fileAfter.jsonc");
 		}
@@ -131,7 +131,7 @@ void testAutoDetectJsonc() {
 		 */
 		@Test
 		void testAutoDetectJsx() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
 		}
@@ -142,7 +142,7 @@ void testAutoDetectJsx() {
 		 */
 		@Test
 		void testAutoDetectMjs() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
 		}
@@ -153,7 +153,7 @@ void testAutoDetectMjs() {
 		 */
 		@Test
 		void testAutoDetectMts() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
 		}
@@ -164,7 +164,7 @@ void testAutoDetectMts() {
 		 */
 		@Test
 		void testAutoDetectTs() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
 		}
@@ -175,7 +175,7 @@ void testAutoDetectTs() {
 		 */
 		@Test
 		void testAutoDetectTsx() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
 		}
@@ -188,7 +188,7 @@ void testAutoDetectTsx() {
 		 */
 		@Test
 		void preservesIgnoredFiles() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.5.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.5.0", downloadDir.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/json/package.json", "biome/json/packageAfter.json");
 		}
@@ -202,7 +202,7 @@ class ConfigFile {
 		@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 step = BiomeStep.withExeDownload("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");
 		}
@@ -213,7 +213,7 @@ void testLineWidth120() {
 		@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 step = BiomeStep.withExeDownload("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");
 		}
@@ -231,7 +231,7 @@ class ExplicitLanguage {
 		 */
 		@Test
 		void testSetLanguageCjs() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -243,7 +243,7 @@ void testSetLanguageCjs() {
 		@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 step = BiomeStep.withExeDownload("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");
 		}
@@ -254,7 +254,7 @@ void testSetLanguageCssExperimental() {
 		 */
 		@Test
 		void testSetLanguageCssStable() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.9.0", downloadDir.toString()).withLanguage("css").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -265,7 +265,7 @@ void testSetLanguageCssStable() {
 		 */
 		@Test
 		void testSetLanguageCts() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -276,7 +276,7 @@ void testSetLanguageCts() {
 		 */
 		@Test
 		void testSetLanguageJs() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -287,7 +287,7 @@ void testSetLanguageJs() {
 		 */
 		@Test
 		void testSetLanguageJson() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("json").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -298,7 +298,7 @@ void testSetLanguageJson() {
 		 */
 		@Test
 		void testSetLanguageJsonc() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsonc").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -309,7 +309,7 @@ void testSetLanguageJsonc() {
 		 */
 		@Test
 		void testSetLanguageJsx() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("jsx").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -320,7 +320,7 @@ void testSetLanguageJsx() {
 		 */
 		@Test
 		void testSetLanguageMjs() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -331,7 +331,7 @@ void testSetLanguageMjs() {
 		 */
 		@Test
 		void testSetLanguageMts() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -342,7 +342,7 @@ void testSetLanguageMts() {
 		 */
 		@Test
 		void testSetLanguageTs() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var step = BiomeStep.withExeDownload("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");
 		}
@@ -353,7 +353,7 @@ void testSetLanguageTs() {
 		 */
 		@Test
 		void testSetLanguageTsx() {
-			var step = BiomeStep.withExeDownload(BiomeFlavor.BIOME, "1.2.0", downloadDir.toString()).withLanguage("tsx").create();
+			var step = BiomeStep.withExeDownload("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 b5f1251e8f55d42fe2a81f01a7cf945293d16b2d Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 1 Jul 2025 13:22:05 +0200
Subject: [PATCH 154/210] Ensure support for version 2.x of biome

The download path changed slightly for version 2.x.
Add tests for version 2.x.
---
 .../biome/BiomeExecutableDownloader.java      |  4 +--
 .../spotless/biome/BiomeSettings.java         | 27 +++++++++++--------
 .../gradle/spotless/BiomeIntegrationTest.java | 25 +++++++++++++++++
 .../spotless/maven/biome/BiomeMavenTest.java  | 13 +++++++++
 .../spotless/biome/BiomeStepTest.java         | 26 ++++++++++++++++++
 5 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
index 2bf02f3efb..3b1e6cec37 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
@@ -278,7 +278,7 @@ private String getDownloadUrl(String version, Platform platform) throws IOExcept
 		var architectureCodeName = getArchitectureCodeName(platform.getArchitecture());
 		var extension = getDownloadUrlExtension(platform.getOs());
 		var platformString = String.format(PLATFORM_PATTERN, osCodeName, architectureCodeName, extension);
-		return String.format(flavor.getUrlPattern(), version, platformString);
+		return String.format(BiomeSettings.getUrlPattern(version), version, platformString);
 	}
 
 	/**
@@ -313,7 +313,7 @@ private String getDownloadUrlExtension(OS os) throws IOException {
 	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(flavor.getDownloadFilePattern(), os, arch, version);
+		var fileName = String.format(BiomeSettings.getDownloadFilePattern(), os, arch, version);
 		return downloadDir.resolve(fileName);
 	}
 
diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
index c2f7028bc5..99f48730e1 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
@@ -19,11 +19,12 @@
  * Settings and constants for Biome to use.
  */
 public final class BiomeSettings {
-	private final static String configName= "biome.json";
-	private final static String defaultVersion = "1.2.0";
-	private final static String downloadFilePattern = "biome-%s-%s-%s";
-	private final static String shortName = "biome";
-	private final static String urlPattern = "https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s";
+	private final static String CONFIG_NAME = "biome.json";
+	private final static String DEFAULT_VERSION = "1.2.0";
+	private final static String DOWNLOAD_FILE_PATTERN = "biome-%s-%s-%s";
+	private final static String SHORT_NAME = "biome";
+	private final static String URL_PATTERN_1X = "https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s";
+	private final static String URL_PATTERN_2X = "https://github.com/biomejs/biome/releases/download/%%40biomejs%%2Fbiome%%40%s/biome-%s";
 
 	private BiomeSettings() {}
 
@@ -31,14 +32,14 @@ private BiomeSettings() {}
 	 * @return The name of the default config file.
 	 */
 	public static String configName() {
-		return configName;
+		return CONFIG_NAME;
 	}
 
 	/**
 	 * @return Default version to use when no version was set explicitly.
 	 */
 	public static String defaultVersion() {
-		return defaultVersion;
+		return DEFAULT_VERSION;
 	}
 
 	/**
@@ -48,23 +49,27 @@ public static String defaultVersion() {
 	 *         the second is the OS, the third is the architecture.
 	 */
 	public static String getDownloadFilePattern() {
-		return downloadFilePattern;
+		return DOWNLOAD_FILE_PATTERN;
 	}
 
 	/**
+	 * @param version The biome version for which to get the URL pattern, e.g. 1.2.0 or 2.0.6.
 	 * @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 static String getUrlPattern() {
-		return urlPattern;
+	public static String getUrlPattern(String version) {
+		if (version != null && version.startsWith("1.")) {
+			return URL_PATTERN_1X;
+		}
+		return URL_PATTERN_2X;
 	}
 
 	/**
 	 * @return The short name of this flavor, e.g. <code>biome</code>.
 	 */
 	public static String shortName() {
-		return shortName;
+		return SHORT_NAME;
 	}
 }
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 0a8dfe7022..689a0cf40e 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
@@ -424,4 +424,29 @@ void preservesIgnoredFiles() throws Exception {
 		assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		assertFile("package.json").sameAsResource("biome/json/packageAfter.json");
 	}
+
+	/**
+	 * Tests that the Gradle plugin works with version 2.x of biome.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void version2x() throws Exception {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('2.0.6')",
+				"    }",
+				"}");
+		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");
+	}
 }
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..1c40393935 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
@@ -248,4 +248,17 @@ void preservesIgnoredFiles() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile("package.json").sameAsResource("biome/json/packageAfter.json");
 	}
+
+	/**
+	 * Tests that the Maven plugin works with version 2.x of biome.
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void version2X() throws Exception {
+		writePomWithBiomeSteps("**/*.js", "<biome><version>2.0.6</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");
+	}
 }
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 462dbaed4f..6500906251 100644
--- a/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
@@ -194,6 +194,32 @@ void preservesIgnoredFiles() {
 		}
 	}
 
+	/**
+	 * Tests for the different biome versions.
+	 */
+	@Nested
+	class BiomeVersion {
+		/**
+		 * Basic test that biome 1.x works.
+		 */
+		@Test
+		void test1x() {
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
+		}
+
+		/**
+		 * Basic test that biome 2.x works.
+		 */
+		@Test
+		void test2x() {
+			var step = BiomeStep.withExeDownload("2.0.6", downloadDir).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
+		}
+	}
+
 	@Nested
 	class ConfigFile {
 		/**

From a40ccc1790068e0b12b3132a6e443657031796fd Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 1 Jul 2025 13:43:15 +0200
Subject: [PATCH 155/210] Run formatter

---
 .../biome/BiomeExecutableDownloader.java      |  2 +-
 .../spotless/biome/BiomeSettings.java         |  2 +-
 .../diffplug/spotless/biome/BiomeStep.java    |  2 +-
 .../gradle/spotless/BiomeStepConfig.java      | 16 +++++--------
 .../gradle/spotless/CssExtension.java         |  2 +-
 .../gradle/spotless/FormatExtension.java      | 24 +++++++------------
 .../gradle/spotless/JavascriptExtension.java  |  8 +++----
 .../gradle/spotless/JsonExtension.java        |  2 +-
 .../gradle/spotless/TypescriptExtension.java  | 11 ++++-----
 .../gradle/spotless/BiomeIntegrationTest.java |  2 +-
 .../diffplug/spotless/maven/css/BiomeCss.java |  2 +-
 .../spotless/maven/generic/AbstractBiome.java |  4 ++--
 .../spotless/maven/generic/Biome.java         |  2 +-
 .../spotless/maven/javascript/BiomeJs.java    |  2 +-
 .../spotless/maven/json/BiomeJson.java        |  2 +-
 .../spotless/maven/typescript/BiomeTs.java    |  2 +-
 .../spotless/maven/biome/BiomeMavenTest.java  |  2 +-
 .../spotless/biome/BiomeStepTest.java         |  2 +-
 18 files changed, 36 insertions(+), 53 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
index 3b1e6cec37..5512dd7c4c 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.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/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
index 99f48730e1..8bef764ba1 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.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.
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 b95068de70..6993fcfaaf 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.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/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BiomeStepConfig.java
index 992b5b393f..49aeb28fc0 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
@@ -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.
@@ -23,10 +23,10 @@
 
 import javax.annotation.Nullable;
 
-import com.diffplug.spotless.biome.BiomeSettings;
 import org.gradle.api.Project;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.biome.BiomeSettings;
 import com.diffplug.spotless.biome.BiomeStep;
 
 public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
@@ -36,8 +36,7 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	 * configuration is used. If this is a relative path, it is resolved against the
 	 * project's base directory.
 	 */
-	@Nullable
-	private Object configPath;
+	@Nullable private Object configPath;
 
 	/**
 	 * Optional directory where the downloaded Biome executable is placed. If this
@@ -45,8 +44,7 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	 * Defaults to
 	 * <code>~/.m2/repository/com/diffplug/spotless/spotless-data/biome</code>.
 	 */
-	@Nullable
-	private Object downloadDir;
+	@Nullable private Object downloadDir;
 
 	/**
 	 * Optional path to the Biome executable. Either a <code>version</code> or a
@@ -63,8 +61,7 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	 * <code>./executable-name</code> if you want to use an executable in the
 	 * project's base directory.
 	 */
-	@Nullable
-	private Object pathToExe;
+	@Nullable private Object pathToExe;
 
 	/**
 	 * A reference to the Gradle project for which spotless is executed.
@@ -84,8 +81,7 @@ public abstract class BiomeStepConfig<Self extends BiomeStepConfig<Self>> {
 	 * version explicitly. This parameter is ignored when you specify a
 	 * <code>pathToExe</code> explicitly.
 	 */
-	@Nullable
-	private String version;
+	@Nullable private String version;
 
 	protected BiomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, String version) {
 		this.project = requireNonNull(project);
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
index f1e844e153..2491faa04e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CssExtension.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.
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 d0ea378958..9e20364768 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
@@ -216,8 +216,7 @@ public void encoding(String charset) {
 	protected FileCollection target, targetExclude;
 
 	/** The value from which files will be excluded if their content contain it. */
-	@Nullable
-	protected String targetExcludeContentPattern = null;
+	@Nullable protected String targetExcludeContentPattern = null;
 
 	protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
 		String formatterStepName = formatterStep.getName();
@@ -685,17 +684,13 @@ 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;
+		@Nullable protected Object npmFile;
 
-		@Nullable
-		protected Object nodeFile;
+		@Nullable protected Object nodeFile;
 
-		@Nullable
-		protected Object npmInstallCache;
+		@Nullable protected Object npmInstallCache;
 
-		@Nullable
-		protected Object npmrcFile;
+		@Nullable protected Object npmrcFile;
 
 		protected Project project;
 
@@ -769,11 +764,9 @@ protected void replaceStep() {
 
 	public class PrettierConfig extends NpmStepConfig<PrettierConfig> {
 
-		@Nullable
-		Object prettierConfigFile;
+		@Nullable Object prettierConfigFile;
 
-		@Nullable
-		Map<String, Object> prettierConfig;
+		@Nullable Map<String, Object> prettierConfig;
 
 		final Map<String, String> devDependencies;
 
@@ -813,8 +806,7 @@ protected FormatterStep createStep() {
 	 * <code>format{ ... }</code>.
 	 */
 	public class BiomeGeneric extends BiomeStepConfig<BiomeGeneric> {
-		@Nullable
-		String language;
+		@Nullable String language;
 
 		/**
 		 * Creates a new Biome config that downloads the Biome executable for the given
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 6d329cfb51..043fd8237a 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-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.
@@ -62,11 +62,9 @@ public static abstract class EslintBaseConfig<T extends EslintBaseConfig<?>>
 			extends NpmStepConfig<EslintBaseConfig<T>> {
 		Map<String, String> devDependencies = new LinkedHashMap<>();
 
-		@Nullable
-		Object configFilePath = null;
+		@Nullable Object configFilePath = null;
 
-		@Nullable
-		String configJs = null;
+		@Nullable String configJs = null;
 
 		public EslintBaseConfig(Project project, Consumer<FormatterStep> replaceStep,
 				Map<String, String> devDependencies) {
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 063e1d8ae9..df0e5e6061 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-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/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java
index e227cfb790..1e7c9efc24 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-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.
@@ -72,11 +72,9 @@ public class TypescriptFormatExtension extends NpmStepConfig<TypescriptFormatExt
 
 		private Map<String, Object> config = Collections.emptyMap();
 
-		@Nullable
-		TsConfigFileType configFileType = null;
+		@Nullable TsConfigFileType configFileType = null;
 
-		@Nullable
-		Object configFilePath = null;
+		@Nullable Object configFilePath = null;
 
 		private final Map<String, String> devDependencies;
 
@@ -197,8 +195,7 @@ public TypescriptEslintConfig eslint(Map<String, String> devDependencies) {
 
 	public class TypescriptEslintConfig extends EslintBaseConfig<TypescriptEslintConfig> {
 
-		@Nullable
-		Object typescriptConfigFilePath = null;
+		@Nullable Object typescriptConfigFilePath = null;
 
 		public TypescriptEslintConfig(Map<String, String> devDependencies) {
 			super(getProject(), TypescriptExtension.this::replaceStep, devDependencies);
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 689a0cf40e..8e4da27e95 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-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.
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
index dc45ecbead..77cfebffe2 100644
--- 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
@@ -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/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 1ca39af989..465965f896 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
@@ -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,10 +17,10 @@
 
 import java.nio.file.Paths;
 
-import com.diffplug.spotless.biome.BiomeSettings;
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.biome.BiomeSettings;
 import com.diffplug.spotless.biome.BiomeStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
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 873dc1506a..439fe15ab9 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-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/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 82abf05592..a838bacd3e 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-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/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 046cc51e1d..67b9f8cd3a 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-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/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 385dc3bb31..2bbae1550a 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-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/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 1c40393935..1072a95da8 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-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.
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 6500906251..db6c535835 100644
--- a/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.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.

From e868b2643bbbdeb3077086deb3754b4be461d8ea Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Tue, 1 Jul 2025 14:15:43 +0200
Subject: [PATCH 156/210] Add entry to changelog

---
 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 ba1e66f1f7..3a6165e509 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
+### Fixed
+* Fix biome formatter for new major release 2.x of biome ([#2537](https://github.com/diffplug/spotless/pull/2537))
+
 ## [3.1.2] - 2025-05-27
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c7fc99944b..be15d11568 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 (
 ### Added
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
+### Fixed
+* Fix biome formatter for new major release 2.x of biome ([#2537](https://github.com/diffplug/spotless/pull/2537))
+
 ## [7.0.4] - 2025-05-27
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 53c6f4b093..b58260e88c 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 (
 ### Added
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
+### Fixed
+* Fix biome formatter for new major release 2.x of biome ([#2537](https://github.com/diffplug/spotless/pull/2537))
+
 ## [2.44.5] - 2025-05-27
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))

From afa0b220660057d52975667a1c3650bc33c45d48 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 2 Jul 2025 17:06:04 +0800
Subject: [PATCH 157/210] Publish to Central Portal

https://central.sonatype.org/news/20250326_ossrh_sunset/
https://github.com/gradle-nexus/publish-plugin?tab=readme-ov-file#publishing-to-maven-central-via-sonatype-central
---
 .github/workflows/deploy.yml |  8 ++++----
 gradle/java-publish.gradle   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ffc164a461..4a4672be17 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,5 +1,5 @@
-# NEXUS_USER
-# NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java
+# CENTRAL_PORTAL_USER
+# CENTRAL_PORTAL_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);
@@ -32,8 +32,8 @@ jobs:
       contents: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}
-      ORG_GRADLE_PROJECT_nexus_pass64: ${{ secrets.NEXUS_PASS64 }}
+      ORG_GRADLE_PROJECT_central_portal_user: ${{ secrets.CENTRAL_PORTAL_USER }}
+      ORG_GRADLE_PROJECT_central_portal_pass64: ${{ secrets.CENTRAL_PORTAL_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 baad061ea8..2c26a692f3 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -11,7 +11,7 @@ def decode64(String varName) {
 
 if (project.parent == null) {
 	group = 'com.diffplug.spotless'
-	def pass = System.env['ORG_GRADLE_PROJECT_nexus_pass64']
+	def pass = System.env['ORG_GRADLE_PROJECT_central_portal_pass64']
 	if (pass != null) {
 		pass = pass.decodeBase64()
 	}
@@ -20,10 +20,10 @@ if (project.parent == null) {
 	nexusPublishing {
 		repositories {
 			sonatype {
-				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 = decode64('ORG_GRADLE_PROJECT_nexus_pass64')
+				nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+				snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+				username = System.env['ORG_GRADLE_PROJECT_central_portal_user']
+				password = decode64('ORG_GRADLE_PROJECT_central_portal_pass64')
 			}
 		}
 	}

From 2ebe138c9646c0d3f438bd5a1cc69ed0b0f47876 Mon Sep 17 00:00:00 2001
From: Vincent Potucek <vpotucek@me.com>
Date: Thu, 3 Jul 2025 10:16:24 +0200
Subject: [PATCH 158/210] Use palantir-java-format as default formatter in
 RemoveUnusedImportsStep

---
 CHANGES.md                                    |  1 +
 .../java/RemoveUnusedImportsStep.java         | 13 ++--
 .../java/RemoveUnusedImportsStepTest.java     | 73 +++++++++++++++++++
 .../java/RemoveUnusedImportsStepTest.java     | 33 ---------
 ...dImportsStep_withGoogleJavaFormatTest.java |  6 +-
 5 files changed, 83 insertions(+), 43 deletions(-)
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
 delete mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java

diff --git a/CHANGES.md b/CHANGES.md
index ba1e66f1f7..8e855c5cbe 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 support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
+* Use `palantir-java-format` as default formatter in `RemoveUnusedImportsStep`. ([#2541](https://github.com/diffplug/spotless/pull/2541))
 
 ## [3.1.2] - 2025-05-27
 ### Fixed
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 753678a86b..fcdb52503b 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-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.
@@ -22,12 +22,12 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
 
-/** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
+/** Uses palantir-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
 public class RemoveUnusedImportsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	static final String NAME = "removeUnusedImports";
 
-	static final String GJF = "google-java-format";
+	static final String DEFAULT_FORMATTER = "palantir-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
@@ -37,18 +37,17 @@ public class RemoveUnusedImportsStep implements Serializable {
 	private RemoveUnusedImportsStep() {}
 
 	public static String defaultFormatter() {
-		return GJF;
+		return DEFAULT_FORMATTER;
 	}
 
 	public static FormatterStep create(Provisioner provisioner) {
-		// The default importRemover is GJF
-		return create(GJF, provisioner);
+		return create(DEFAULT_FORMATTER, provisioner);
 	}
 
 	public static FormatterStep create(String unusedImportRemover, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner");
 		switch (unusedImportRemover) {
-		case GJF:
+		case DEFAULT_FORMATTER:
 			return GoogleJavaFormatStep.createRemoveUnusedImportsOnly(provisioner);
 		case CLEANTHAT:
 			return CleanthatJavaStep.createWithStepName(NAME, CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", List.of(CLEANTHAT_MUTATOR), List.of(), false, provisioner);
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
new file mode 100644
index 0000000000..85713423cc
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.diffplug.spotless.java.RemoveUnusedImportsStep.DEFAULT_FORMATTER;
+import static com.diffplug.spotless.java.RemoveUnusedImportsStep.NAME;
+import static com.diffplug.spotless.java.RemoveUnusedImportsStep.defaultFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class RemoveUnusedImportsStepTest extends MavenIntegrationHarness {
+
+	@Test
+	void testRemoveUnusedImports() throws Exception {
+		writePomWithJavaSteps("<removeUnusedImports/>");
+
+		String path = "src/main/java/test.java";
+		setFile(path).toResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("java/removeunusedimports/JavaCodeWithPackageFormatted.test");
+	}
+
+	@Test
+	void testDefaults() {
+		assertEquals("palantir-java-format", defaultFormatter());
+		assertEquals("palantir-java-format", DEFAULT_FORMATTER);
+		assertEquals("removeUnusedImports", NAME);
+	}
+
+	@Test
+	void testCreateWithDefaultFormatter() {
+		assertEquals(NAME, RemoveUnusedImportsStep.create((groupArtifact, version) -> Collections.emptySet()).getName());
+	}
+
+	@Test
+	void testCreateWithPalantirFormatter() {
+		assertEquals(NAME, RemoveUnusedImportsStep.create("palantir-java-format", (groupArtifact, version) -> Collections.emptySet()).getName());
+	}
+
+	@Test
+	void testCreateWithCleanthatFormatter() {
+		assertEquals(NAME, RemoveUnusedImportsStep.create("cleanthat-javaparser-unnecessaryimport", (groupArtifact, version) -> Collections.emptySet()).getName());
+	}
+
+	@Test
+	void testCreateWithInvalidFormatter() {
+		assertThrows(IllegalArgumentException.class, () -> RemoveUnusedImportsStep.create("invalid-formatter", (groupArtifact, version) -> Collections.emptySet()));
+	}
+
+	@Test
+	void testCreateWithNullProvisioner() {
+		assertThrows(NullPointerException.class, () -> RemoveUnusedImportsStep.create("palantir-java-format", null));
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java
deleted file mode 100644
index 50853ba914..0000000000
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java
+++ /dev/null
@@ -1,33 +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.maven.java;
-
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.spotless.maven.MavenIntegrationHarness;
-
-class RemoveUnusedImportsStepTest extends MavenIntegrationHarness {
-
-	@Test
-	void testRemoveUnusedInports() throws Exception {
-		writePomWithJavaSteps("<removeUnusedImports/>");
-
-		String path = "src/main/java/test.java";
-		setFile(path).toResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile(path).sameAsResource("java/removeunusedimports/JavaCodeWithPackageFormatted.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 44699a8215..766816a659 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
@@ -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,7 +25,7 @@
 class RemoveUnusedImportsStep_withGoogleJavaFormatTest {
 	@Test
 	void behavior() throws Exception {
-		FormatterStep step = RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.GJF, TestProvisioner.mavenCentral());
+		FormatterStep step = RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.DEFAULT_FORMATTER, TestProvisioner.mavenCentral());
 		StepHarness.forStep(step)
 				.testResource("java/removeunusedimports/JavaCodeUnformatted.test", "java/removeunusedimports/JavaCodeFormatted.test")
 				.testResource("java/removeunusedimports/JavaCodeWithLicenseUnformatted.test", "java/removeunusedimports/JavaCodeWithLicenseFormatted.test")
@@ -48,7 +48,7 @@ protected void setupTest(API api) {
 
 			@Override
 			protected FormatterStep create() {
-				return RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.GJF, TestProvisioner.mavenCentral());
+				return RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.DEFAULT_FORMATTER, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}

From 86c8ee02b6ef623656f49203b216de374829e9ef Mon Sep 17 00:00:00 2001
From: Vincent Potucek <vpotucek@me.com>
Date: Thu, 3 Jul 2025 10:24:23 +0200
Subject: [PATCH 159/210] feat: Disable `expandEmptyElements`, to avoid empty
 body warnings

---
 CHANGES.md                                    |   1 +
 .../com/diffplug/spotless/pom/SortPomCfg.java |   4 +-
 .../diffplug/spotless/pom/SortPomCfgTest.java | 177 ++++++++++++++++++
 3 files changed, 180 insertions(+), 2 deletions(-)
 create mode 100644 lib/src/test/java/com/diffplug/spotless/pom/SortPomCfgTest.java

diff --git a/CHANGES.md b/CHANGES.md
index ba1e66f1f7..90eaa05320 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 support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
+* feat: Disable `expandEmptyElements`, to avoid empty body warnings. ([#2520](https://github.com/diffplug/spotless/pull/2520))
 
 ## [3.1.2] - 2025-05-27
 ### Fixed
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 08a0308178..db37ae25fd 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-2024 DiffPlug
+ * Copyright 2021-2025 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 @@ public class SortPomCfg implements Serializable {
 
 	public String lineSeparator = System.getProperty("line.separator");
 
-	public boolean expandEmptyElements = true;
+	public boolean expandEmptyElements;
 
 	public boolean spaceBeforeCloseEmptyElement = false;
 
diff --git a/lib/src/test/java/com/diffplug/spotless/pom/SortPomCfgTest.java b/lib/src/test/java/com/diffplug/spotless/pom/SortPomCfgTest.java
new file mode 100644
index 0000000000..b0a336f189
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/pom/SortPomCfgTest.java
@@ -0,0 +1,177 @@
+/*
+ * 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.pom;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class SortPomCfgTest {
+
+	@Test
+	void testDefaultValues() {
+		SortPomCfg cfg = new SortPomCfg();
+
+		// Test default values using AssertJ
+		assertThat(cfg.version).isEqualTo("4.0.0");
+		assertThat(cfg.encoding).isEqualTo("UTF-8");
+		assertThat(cfg.lineSeparator).isEqualTo(System.getProperty("line.separator"));
+		assertThat(cfg.expandEmptyElements).isFalse();
+		assertThat(cfg.spaceBeforeCloseEmptyElement).isFalse();
+		assertThat(cfg.keepBlankLines).isTrue();
+		assertThat(cfg.endWithNewline).isTrue();
+		assertThat(cfg.nrOfIndentSpace).isEqualTo(2);
+		assertThat(cfg.indentBlankLines).isFalse();
+		assertThat(cfg.indentSchemaLocation).isFalse();
+		assertThat(cfg.indentAttribute).isNull();
+		assertThat(cfg.predefinedSortOrder).isEqualTo("recommended_2008_06");
+		assertThat(cfg.quiet).isFalse();
+		assertThat(cfg.sortOrderFile).isNull();
+		assertThat(cfg.sortDependencies).isNull();
+		assertThat(cfg.sortDependencyManagement).isNull();
+		assertThat(cfg.sortDependencyExclusions).isNull();
+		assertThat(cfg.sortPlugins).isNull();
+		assertThat(cfg.sortProperties).isFalse();
+		assertThat(cfg.sortModules).isFalse();
+		assertThat(cfg.sortExecutions).isFalse();
+	}
+
+	@Test
+	void testFieldSetters() {
+		SortPomCfg cfg = new SortPomCfg();
+
+		// Set all fields
+		cfg.version = "4.1.0";
+		cfg.encoding = "ISO-8859-1";
+		cfg.lineSeparator = "\n";
+		cfg.expandEmptyElements = true;
+		cfg.spaceBeforeCloseEmptyElement = true;
+		cfg.keepBlankLines = false;
+		cfg.endWithNewline = false;
+		cfg.nrOfIndentSpace = 4;
+		cfg.indentBlankLines = true;
+		cfg.indentSchemaLocation = true;
+		cfg.indentAttribute = "attribute";
+		cfg.predefinedSortOrder = "custom";
+		cfg.quiet = true;
+		cfg.sortOrderFile = "sortOrder.xml";
+		cfg.sortDependencies = "groupId,artifactId";
+		cfg.sortDependencyManagement = "scope,groupId";
+		cfg.sortDependencyExclusions = "artifactId";
+		cfg.sortPlugins = "groupId";
+		cfg.sortProperties = true;
+		cfg.sortModules = true;
+		cfg.sortExecutions = true;
+
+		// Verify all set values with AssertJ
+		assertThat(cfg.version).isEqualTo("4.1.0");
+		assertThat(cfg.encoding).isEqualTo("ISO-8859-1");
+		assertThat(cfg.lineSeparator).isEqualTo("\n");
+		assertThat(cfg.expandEmptyElements).isTrue();
+		assertThat(cfg.spaceBeforeCloseEmptyElement).isTrue();
+		assertThat(cfg.keepBlankLines).isFalse();
+		assertThat(cfg.endWithNewline).isFalse();
+		assertThat(cfg.nrOfIndentSpace).isEqualTo(4);
+		assertThat(cfg.indentBlankLines).isTrue();
+		assertThat(cfg.indentSchemaLocation).isTrue();
+		assertThat(cfg.indentAttribute).isEqualTo("attribute");
+		assertThat(cfg.predefinedSortOrder).isEqualTo("custom");
+		assertThat(cfg.quiet).isTrue();
+		assertThat(cfg.sortOrderFile).isEqualTo("sortOrder.xml");
+		assertThat(cfg.sortDependencies).isEqualTo("groupId,artifactId");
+		assertThat(cfg.sortDependencyManagement).isEqualTo("scope,groupId");
+		assertThat(cfg.sortDependencyExclusions).isEqualTo("artifactId");
+		assertThat(cfg.sortPlugins).isEqualTo("groupId");
+		assertThat(cfg.sortProperties).isTrue();
+		assertThat(cfg.sortModules).isTrue();
+		assertThat(cfg.sortExecutions).isTrue();
+	}
+
+	@Test
+	void testNullHandling() {
+		SortPomCfg cfg = new SortPomCfg();
+
+		// Set nullable fields to null
+		cfg.version = null;
+		cfg.encoding = null;
+		cfg.lineSeparator = null;
+		cfg.indentAttribute = null;
+		cfg.predefinedSortOrder = null;
+		cfg.sortOrderFile = null;
+		cfg.sortDependencies = null;
+		cfg.sortDependencyManagement = null;
+		cfg.sortDependencyExclusions = null;
+		cfg.sortPlugins = null;
+
+		// Verify null values with AssertJ
+		assertThat(cfg.version).isNull();
+		assertThat(cfg.encoding).isNull();
+		assertThat(cfg.lineSeparator).isNull();
+		assertThat(cfg.indentAttribute).isNull();
+		assertThat(cfg.predefinedSortOrder).isNull();
+		assertThat(cfg.sortOrderFile).isNull();
+		assertThat(cfg.sortDependencies).isNull();
+		assertThat(cfg.sortDependencyManagement).isNull();
+		assertThat(cfg.sortDependencyExclusions).isNull();
+		assertThat(cfg.sortPlugins).isNull();
+	}
+
+	@Test
+	void testBooleanFieldsEdgeCases() {
+		SortPomCfg cfg = new SortPomCfg();
+
+		// Toggle all boolean fields
+		cfg.expandEmptyElements = !cfg.expandEmptyElements;
+		cfg.spaceBeforeCloseEmptyElement = !cfg.spaceBeforeCloseEmptyElement;
+		cfg.keepBlankLines = !cfg.keepBlankLines;
+		cfg.endWithNewline = !cfg.endWithNewline;
+		cfg.indentBlankLines = !cfg.indentBlankLines;
+		cfg.indentSchemaLocation = !cfg.indentSchemaLocation;
+		cfg.quiet = !cfg.quiet;
+		cfg.sortProperties = !cfg.sortProperties;
+		cfg.sortModules = !cfg.sortModules;
+		cfg.sortExecutions = !cfg.sortExecutions;
+
+		// Verify all boolean fields are toggled
+		assertThat(cfg.expandEmptyElements).isTrue();
+		assertThat(cfg.spaceBeforeCloseEmptyElement).isTrue();
+		assertThat(cfg.keepBlankLines).isFalse();
+		assertThat(cfg.endWithNewline).isFalse();
+		assertThat(cfg.indentBlankLines).isTrue();
+		assertThat(cfg.indentSchemaLocation).isTrue();
+		assertThat(cfg.quiet).isTrue();
+		assertThat(cfg.sortProperties).isTrue();
+		assertThat(cfg.sortModules).isTrue();
+		assertThat(cfg.sortExecutions).isTrue();
+	}
+
+	@Test
+	void testNumericFieldEdgeCases() {
+		SortPomCfg cfg = new SortPomCfg();
+
+		// Test minimum value
+		cfg.nrOfIndentSpace = 0;
+		assertThat(cfg.nrOfIndentSpace).isZero();
+
+		// Test negative value
+		cfg.nrOfIndentSpace = -1;
+		assertThat(cfg.nrOfIndentSpace).isNegative();
+
+		// Test large value
+		cfg.nrOfIndentSpace = Integer.MAX_VALUE;
+		assertThat(cfg.nrOfIndentSpace).isEqualTo(Integer.MAX_VALUE);
+	}
+}

From f6ebe92ffe47ed2d7cfee4860f6cf282eda447c2 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 30 Jun 2025 07:58:44 +0200
Subject: [PATCH 160/210] chore: bump/replace server deps

---
 .../com/diffplug/spotless/npm/common-serve.js        | 12 +++++++-----
 .../com/diffplug/spotless/npm/eslint-package.json    |  6 +++---
 .../com/diffplug/spotless/npm/prettier-package.json  |  6 +++---
 .../com/diffplug/spotless/npm/tsfmt-package.json     |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

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 5bfcb35612..291561eda4 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,6 +1,6 @@
 // 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 gracefulShutdown = require("http-graceful-shutdown");
 const express = require("express");
 const app = express();
 
@@ -48,12 +48,14 @@ var listener = app.listen(0, "127.0.0.1", () => {
 		}
 	});
 });
-const shutdownManager = new GracefulShutdownManager(listener);
+const shutdown = gracefulShutdown(listener, {
+	forceExit: false, // let the event loop clear
+	finally: () => debugLog("graceful shutdown finished."),
+});
 
 app.post("/shutdown", (req, res) => {
 	res.status(200).send("Shutting down");
-	setTimeout(function () {
-		shutdownManager.terminate(() => debugLog("graceful shutdown finished."));
+	setTimeout(async () => {
+		await shutdown()
 	}, 200);
 });
-
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 0d7ce930f7..c6c33ee5a9 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
@@ -9,11 +9,11 @@
 	},
 	"devDependencies": {
 ${devDependencies},
-		"express": "4.18.2",
-		"@moebius/http-graceful-shutdown": "1.1.0"
+		"express": "5.1.0",
+		"http-graceful-shutdown": "3.1.14"
 	},
 	"dependencies": {},
 	"engines": {
-		"node": ">=6"
+		"node": ">= 18"
 	}
 }
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 395a05da67..0a7d522b80 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,11 +9,11 @@
 	},
 	"devDependencies": {
 ${devDependencies},
-		"express": "4.18.2",
-		"@moebius/http-graceful-shutdown": "1.1.0"
+		"express": "5.1.0",
+		"http-graceful-shutdown": "3.1.14"
 	},
 	"dependencies": {},
 	"engines": {
-		"node": ">=6"
+		"node": ">= 18"
 	}
 }
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 483dd0753d..f098b08edf 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,11 +9,11 @@
 	},
 	"devDependencies": {
 ${devDependencies},
-		"express": "4.18.2",
-		"@moebius/http-graceful-shutdown": "1.1.0"
+		"express": "5.1.0",
+		"http-graceful-shutdown": "3.1.14"
 	},
 	"dependencies": {},
 	"engines": {
-		"node": ">= 4.2.0"
+		"node": ">= 18"
 	}
 }

From fea6e811bb9919b44f578e3436c06769fb5ded89 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 30 Jun 2025 07:59:05 +0200
Subject: [PATCH 161/210] fix: use correct variable name in error case

---
 lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b9f20a1472..ffbb36c8a4 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
@@ -19,7 +19,7 @@ app.post("/tsfmt/format", (req, res) => {
         */
 		// result contains 'message' (String), 'error' (boolean), 'dest' (String) => formatted
 		if (resultMap.error !== undefined && resultMap.error) {
-			res.status(400).send(resultmap.message);
+			res.status(400).send(resultMap.message);
 			return;
 		}
 		res.set("Content-Type", "text/plain");

From c93a15804338c9645bdf6e89fe3e713308d10942 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 30 Jun 2025 07:59:19 +0200
Subject: [PATCH 162/210] chore: bump internal version number(s)

---
 .../resources/com/diffplug/spotless/npm/eslint-package.json     | 2 +-
 .../resources/com/diffplug/spotless/npm/prettier-package.json   | 2 +-
 .../main/resources/com/diffplug/spotless/npm/tsfmt-package.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 c6c33ee5a9..c4bdba5209 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,6 +1,6 @@
 {
 	"name": "spotless-eslint",
-	"version": "2.0.0",
+	"version": "4.0.0",
 	"description": "Spotless formatter step for running eslint as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",
 	"license": "Apache-2.0",
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 0a7d522b80..a7c219625c 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,6 +1,6 @@
 {
 	"name": "spotless-prettier",
-	"version": "2.0.0",
+	"version": "4.0.0",
 	"description": "Spotless formatter step for running prettier as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",
 	"license": "Apache-2.0",
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 f098b08edf..d6c9a8a656 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,6 +1,6 @@
 {
 	"name": "spotless-tsfmt",
-	"version": "2.0.0",
+	"version": "4.0.0",
 	"description": "Spotless formatter step for running tsfmt as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",
 	"license": "Apache-2.0",

From 88153674bcb8b103d562e617321b7a91cc4da3dc Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 3 Jul 2025 20:17:55 +0200
Subject: [PATCH 163/210] chore: make sure to calculate different hashes if
 serve-files change

this was a hidden update issue: if we change the serve-script content
between two releases but the user keeps the package.json the same, the
md5 hash used for the node-modules-dir stayed the same, resulting in us
not using the latest version of the serve script but keep using the old
one. That was especially harmful in the case where we changed the api of
the serve-script to accept a uuid to allow multiple instances. The old
script just ignored that resulting in a server-process that was never
found due to wrong port-file-names written/waited for.
---
 lib/build.gradle                              |  1 +
 .../spotless/npm/NodeServerLayout.java        | 10 ++---
 .../npm/NpmFormatterStepStateBase.java        |  2 +-
 .../spotless/npm/NpmResourceHelper.java       | 13 +++++--
 .../spotless/npm/NpmResourceHelperTest.java   | 38 +++++++++++++++++++
 5 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 lib/src/test/java/com/diffplug/spotless/npm/NpmResourceHelperTest.java

diff --git a/lib/build.gradle b/lib/build.gradle
index fcf59cd414..4f4addc2d5 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -76,6 +76,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 projects.testlib
 	testCommonRuntimeOnly "org.junit.platform:junit-platform-launcher"
 
 	// GLUE CODE (alphabetic order please)
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 850ea4eb6b..a6089c3972 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-2023 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.
@@ -37,16 +37,16 @@ class NodeServerLayout {
 	private final File serveJsFile;
 	private final File npmrcFile;
 
-	NodeServerLayout(File buildDir, String packageJsonContent) {
-		this.nodeModulesDir = new File(buildDir, nodeModulesDirName(packageJsonContent));
+	NodeServerLayout(File buildDir, String packageJsonContent, String serveJsContent) {
+		this.nodeModulesDir = new File(buildDir, nodeModulesDirName(packageJsonContent, serveJsContent));
 		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);
+	private static String nodeModulesDirName(String packageJsonContent, String serveJsContent) {
+		String md5Hash = NpmResourceHelper.md5(packageJsonContent, serveJsContent);
 		Matcher matcher = PACKAGE_JSON_NAME_PATTERN.matcher(packageJsonContent);
 		if (!matcher.find()) {
 			throw new IllegalArgumentException("package.json must contain a name property");
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 9b37533880..9f27942abc 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java
@@ -71,7 +71,7 @@ public static class Runtime {
 
 		Runtime(NpmFormatterStepStateBase parent) {
 			this.parent = parent;
-			this.nodeServerLayout = new NodeServerLayout(parent.locations.buildDir(), parent.npmConfig.getPackageJsonContent());
+			this.nodeServerLayout = new NodeServerLayout(parent.locations.buildDir(), parent.npmConfig.getPackageJsonContent(), parent.npmConfig.getServeScriptContent());
 			this.nodeServeApp = new NodeServeApp(nodeServerLayout, parent.npmConfig, parent.locations);
 		}
 
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 7a28685de0..94a7344980 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-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.
@@ -27,6 +27,7 @@
 import java.util.Objects;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.diffplug.spotless.ThrowingEx;
 
@@ -140,9 +141,15 @@ static String md5(File file) {
 		return md5(readUtf8StringFromFile(file));
 	}
 
-	static String md5(String fileContent) {
+	static String md5(String fileContent, String... additionalFileContents) {
+		Objects.requireNonNull(fileContent, "fileContent must not be null");
+		Stream<String> additionalFilecontentStream = Stream.concat(
+				Stream.of(fileContent),
+				Stream.of(additionalFileContents));
 		MessageDigest md = ThrowingEx.get(() -> MessageDigest.getInstance("MD5"));
-		md.update(fileContent.getBytes(StandardCharsets.UTF_8));
+		String stringToHash = additionalFilecontentStream.collect(Collectors.joining("@@@"));
+		md.update(stringToHash.getBytes(StandardCharsets.UTF_8));
+
 		byte[] digest = md.digest();
 		// convert byte array digest to hex string
 		StringBuilder sb = new StringBuilder();
diff --git a/lib/src/test/java/com/diffplug/spotless/npm/NpmResourceHelperTest.java b/lib/src/test/java/com/diffplug/spotless/npm/NpmResourceHelperTest.java
new file mode 100644
index 0000000000..2fd969f864
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/npm/NpmResourceHelperTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.npm;
+
+import static com.diffplug.selfie.Selfie.expectSelfie;
+
+import org.junit.jupiter.api.Test;
+
+class NpmResourceHelperTest {
+
+	@Test
+	void itCalculatesMd5ForSingleString() {
+		String input = "Hello, World!";
+
+		expectSelfie(NpmResourceHelper.md5(input)).toBe("65a8e27d8879283831b664bd8b7f0ad4");
+	}
+
+	@Test
+	void itCalculatesMd5ForMultipleStrings() {
+		String input1 = "Hello, World!";
+		String input2 = "Hello, Spencer!";
+
+		expectSelfie(NpmResourceHelper.md5(input1, input2)).toBe("371ba0fbf3d73b33e71b4af8dc6afe00");
+	}
+}

From 5f6880f73a7d7394ab7f2e0360ba2f88e457635b Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 3 Jul 2025 20:44:56 +0200
Subject: [PATCH 164/210] chore: assert new expected behaviour in test

---
 .../spotless/npm/NodeServerLayoutTest.java    | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 lib/src/test/java/com/diffplug/spotless/npm/NodeServerLayoutTest.java

diff --git a/lib/src/test/java/com/diffplug/spotless/npm/NodeServerLayoutTest.java b/lib/src/test/java/com/diffplug/spotless/npm/NodeServerLayoutTest.java
new file mode 100644
index 0000000000..f2cb55943d
--- /dev/null
+++ b/lib/src/test/java/com/diffplug/spotless/npm/NodeServerLayoutTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.npm;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.ResourceHarness;
+
+class NodeServerLayoutTest extends ResourceHarness {
+
+	@Test
+	void itCalculatesSameNodeModulesDirForSameContent() throws IOException {
+		File testDir = newFolder("build");
+		String packageJsonContent = prettierPackageJson(Collections.emptyMap());
+		String serveJsContent = "fun main() { console.log('Hello, world!'); }";
+		NodeServerLayout layout1 = new NodeServerLayout(testDir, packageJsonContent, serveJsContent);
+		NodeServerLayout layout2 = new NodeServerLayout(testDir, packageJsonContent, serveJsContent);
+
+		assertThat(layout1.nodeModulesDir()).isEqualTo(layout2.nodeModulesDir());
+	}
+
+	@Test
+	void itCalculatesDifferentNodeModulesDirForDifferentPackageJson() throws IOException {
+		File testDir = newFolder("build");
+		String packageJsonContent1 = prettierPackageJson(Collections.singletonMap("prettier-plugin-xy", "^2.0.0"));
+		String packageJsonContent2 = prettierPackageJson(Collections.singletonMap("prettier-plugin-xy", "^2.1.0"));
+		String serveJsContent = "fun main() { console.log('Hello, world!'); }";
+
+		NodeServerLayout layout1 = new NodeServerLayout(testDir, packageJsonContent1, serveJsContent);
+		NodeServerLayout layout2 = new NodeServerLayout(testDir, packageJsonContent2, serveJsContent);
+
+		assertThat(layout1.nodeModulesDir()).isNotEqualTo(layout2.nodeModulesDir());
+	}
+
+	@Test
+	void itCalculatesDifferentNodeModulesDirForDifferentServeJs() throws IOException {
+		File testDir = newFolder("build");
+		String packageJsonContent = prettierPackageJson(Collections.emptyMap());
+		String serveJsContent1 = "fun main() { console.log('Hello, world!'); }";
+		String serveJsContent2 = "fun main() { console.log('Goodbye, world!'); }";
+
+		NodeServerLayout layout1 = new NodeServerLayout(testDir, packageJsonContent, serveJsContent1);
+		NodeServerLayout layout2 = new NodeServerLayout(testDir, packageJsonContent, serveJsContent2);
+
+		assertThat(layout1.nodeModulesDir()).isNotEqualTo(layout2.nodeModulesDir());
+	}
+
+	static String prettierPackageJson(Map<String, String> dependencies) {
+		String templateContent = NpmResourceHelper.readUtf8StringFromClasspath(NodeServerLayoutTest.class, "/com/diffplug/spotless/npm/prettier-package.json");
+		String dependenciesList = dependencies.entrySet().stream()
+				.map(entry -> String.format("\"%s\": \"%s\"", entry.getKey(), entry.getValue()))
+				.reduce((a, b) -> a + ",\n  " + b)
+				.orElse("");
+
+		return templateContent.replace("${devDependencies}", dependenciesList);
+	}
+}

From 7572d5f42683149af00a51be69b29adc514e5653 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 3 Jul 2025 21:17:39 +0200
Subject: [PATCH 165/210] chore: implement PR feedback

---
 .../com/diffplug/spotless/npm/NpmResourceHelper.java   |  7 +++++--
 .../com/diffplug/spotless/npm/common-serve.js          | 10 +++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

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 94a7344980..3c146cd315 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java
@@ -32,6 +32,9 @@
 import com.diffplug.spotless.ThrowingEx;
 
 final class NpmResourceHelper {
+
+	public static final String MD5_STRING_DELIMITER = "@@@";
+
 	private NpmResourceHelper() {
 		// no instance required
 	}
@@ -143,11 +146,11 @@ static String md5(File file) {
 
 	static String md5(String fileContent, String... additionalFileContents) {
 		Objects.requireNonNull(fileContent, "fileContent must not be null");
-		Stream<String> additionalFilecontentStream = Stream.concat(
+		Stream<String> additionalFileContentStream = Stream.concat(
 				Stream.of(fileContent),
 				Stream.of(additionalFileContents));
 		MessageDigest md = ThrowingEx.get(() -> MessageDigest.getInstance("MD5"));
-		String stringToHash = additionalFilecontentStream.collect(Collectors.joining("@@@"));
+		String stringToHash = additionalFileContentStream.collect(Collectors.joining(MD5_STRING_DELIMITER));
 		md.update(stringToHash.getBytes(StandardCharsets.UTF_8));
 
 		byte[] digest = md.digest();
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 291561eda4..edce61465a 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,6 +1,6 @@
 // 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 gracefulShutdown = require("http-graceful-shutdown");
+const shutdownServer = require("http-graceful-shutdown");
 const express = require("express");
 const app = express();
 
@@ -48,7 +48,7 @@ var listener = app.listen(0, "127.0.0.1", () => {
 		}
 	});
 });
-const shutdown = gracefulShutdown(listener, {
+const shutdown = shutdownServer(listener, {
 	forceExit: false, // let the event loop clear
 	finally: () => debugLog("graceful shutdown finished."),
 });
@@ -56,6 +56,10 @@ const shutdown = gracefulShutdown(listener, {
 app.post("/shutdown", (req, res) => {
 	res.status(200).send("Shutting down");
 	setTimeout(async () => {
-		await shutdown()
+		try {
+			await shutdown();
+		} catch (err) {
+			console.error("Error during shutdown:", err);
+		}
 	}, 200);
 });

From 3bfd0aebe1dab45221749632da93ea0839a4205a Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Thu, 3 Jul 2025 21:17:52 +0200
Subject: [PATCH 166/210] docs: note changes in changelog

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

diff --git a/CHANGES.md b/CHANGES.md
index 938e3c385c..50b69be234 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
+### Fixed
+* Make sure npm-based formatters use the correct `node_modules` directory when running in parallel. ([#2542](https://github.com/diffplug/spotless/pull/2542))
+
+### Changed
+* Bump internal dependencies for npm-based formatters ([#2542](https://github.com/diffplug/spotless/pull/2542))
+
 ## [3.1.2] - 2025-05-27
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 121d9d922c..f0e50b198b 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -7,6 +7,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
+### Fixed
+* Make sure npm-based formatters use the correct `node_modules` directory when running in parallel. ([#2542](https://github.com/diffplug/spotless/pull/2542))
+
+### Changed
+* Bump internal dependencies for npm-based formatters ([#2542](https://github.com/diffplug/spotless/pull/2542))\
+
 ## [7.0.4] - 2025-05-27
 ### Fixed
 * Fix `UnsupportedOperationException` in the Gradle plugin when using `targetExcludeContent[Pattern]` ([#2487](https://github.com/diffplug/spotless/pull/2487))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index cab00b07af..ea9a32b918 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,6 +7,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 
+### Fixed
+* Make sure npm-based formatters use the correct `node_modules` directory when running in parallel. ([#2542](https://github.com/diffplug/spotless/pull/2542))
+
+### Changed
+* Bump internal dependencies for npm-based formatters ([#2542](https://github.com/diffplug/spotless/pull/2542))
+
 ## [2.44.5] - 2025-05-27
 ### Changed
 * Bump default `eclipse` version to latest `4.34` -> `4.35`. ([#2458](https://github.com/diffplug/spotless/pull/2458))

From 427369317ceaaaed350f830a9fb487a677220eac Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 4 Jul 2025 09:41:54 +0800
Subject: [PATCH 167/210] Link PRs in IDEA

---
 .idea/vcs.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..03539f0087
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#(\d+)" />
+          <option name="linkRegexp" value="https://github.com/diffplug/spotless/pull/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From 694eb3074407e7fd3999f52f826a48b18c533259 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@localhost>
Date: Sun, 6 Jul 2025 22:54:21 -0700
Subject: [PATCH 168/210] Add the changes to the plugin-maven/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 aa150bf6cd..bf06a01e06 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 (
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
 ### Fixed
+* `SortPom` disable expandEmptyElements, to avoid empty body warnings. ([#2520](https://github.com/diffplug/spotless/pull/2520))
 * Fix biome formatter for new major release 2.x of biome ([#2537](https://github.com/diffplug/spotless/pull/2537))
 * Make sure npm-based formatters use the correct `node_modules` directory when running in parallel. ([#2542](https://github.com/diffplug/spotless/pull/2542))
 ### Changed

From cb202b11ff3ac041fc188457e5420d87c119bec0 Mon Sep 17 00:00:00 2001
From: Vincent Potucek <vpotucek@me.com>
Date: Mon, 7 Jul 2025 17:06:51 +0200
Subject: [PATCH 169/210] Revert "Use palantir-java-format as default formatter
 in RemoveUnusedImportsStep"

This reverts commit 2ebe138c
---
 CHANGES.md                                    |  3 -
 .../java/RemoveUnusedImportsStep.java         | 13 ++--
 .../java/RemoveUnusedImportsStepTest.java     | 73 -------------------
 .../java/RemoveUnusedImportsStepTest.java     | 33 +++++++++
 ...dImportsStep_withGoogleJavaFormatTest.java |  6 +-
 5 files changed, 43 insertions(+), 85 deletions(-)
 delete mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java

diff --git a/CHANGES.md b/CHANGES.md
index 2f9e031795..735eca7576 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,7 +13,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
-* Use `palantir-java-format` as default formatter in `RemoveUnusedImportsStep`. ([#2541](https://github.com/diffplug/spotless/pull/2541))
 * scalafmt: enforce version consistency between the version configured in Spotless and the version declared in Scalafmt config file ([#2460](https://github.com/diffplug/spotless/issues/2460))
 ### Fixed
 * `SortPom` disable expandEmptyElements, to avoid empty body warnings. ([#2520](https://github.com/diffplug/spotless/pull/2520))
@@ -418,8 +417,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [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
-* `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
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 fcdb52503b..753678a86b 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-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.
@@ -22,12 +22,12 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
 
-/** Uses palantir-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
+/** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
 public class RemoveUnusedImportsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	static final String NAME = "removeUnusedImports";
 
-	static final String DEFAULT_FORMATTER = "palantir-java-format";
+	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
@@ -37,17 +37,18 @@ public class RemoveUnusedImportsStep implements Serializable {
 	private RemoveUnusedImportsStep() {}
 
 	public static String defaultFormatter() {
-		return DEFAULT_FORMATTER;
+		return GJF;
 	}
 
 	public static FormatterStep create(Provisioner provisioner) {
-		return create(DEFAULT_FORMATTER, provisioner);
+		// The default importRemover is GJF
+		return create(GJF, provisioner);
 	}
 
 	public static FormatterStep create(String unusedImportRemover, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner");
 		switch (unusedImportRemover) {
-		case DEFAULT_FORMATTER:
+		case GJF:
 			return GoogleJavaFormatStep.createRemoveUnusedImportsOnly(provisioner);
 		case CLEANTHAT:
 			return CleanthatJavaStep.createWithStepName(NAME, CleanthatJavaStep.defaultGroupArtifact(), CleanthatJavaStep.defaultVersion(), "99.9", List.of(CLEANTHAT_MUTATOR), List.of(), false, provisioner);
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
deleted file mode 100644
index 85713423cc..0000000000
--- a/plugin-maven/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStepTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF 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 static com.diffplug.spotless.java.RemoveUnusedImportsStep.DEFAULT_FORMATTER;
-import static com.diffplug.spotless.java.RemoveUnusedImportsStep.NAME;
-import static com.diffplug.spotless.java.RemoveUnusedImportsStep.defaultFormatter;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.util.Collections;
-
-import org.junit.jupiter.api.Test;
-
-import com.diffplug.spotless.maven.MavenIntegrationHarness;
-
-class RemoveUnusedImportsStepTest extends MavenIntegrationHarness {
-
-	@Test
-	void testRemoveUnusedImports() throws Exception {
-		writePomWithJavaSteps("<removeUnusedImports/>");
-
-		String path = "src/main/java/test.java";
-		setFile(path).toResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test");
-		mavenRunner().withArguments("spotless:apply").runNoError();
-		assertFile(path).sameAsResource("java/removeunusedimports/JavaCodeWithPackageFormatted.test");
-	}
-
-	@Test
-	void testDefaults() {
-		assertEquals("palantir-java-format", defaultFormatter());
-		assertEquals("palantir-java-format", DEFAULT_FORMATTER);
-		assertEquals("removeUnusedImports", NAME);
-	}
-
-	@Test
-	void testCreateWithDefaultFormatter() {
-		assertEquals(NAME, RemoveUnusedImportsStep.create((groupArtifact, version) -> Collections.emptySet()).getName());
-	}
-
-	@Test
-	void testCreateWithPalantirFormatter() {
-		assertEquals(NAME, RemoveUnusedImportsStep.create("palantir-java-format", (groupArtifact, version) -> Collections.emptySet()).getName());
-	}
-
-	@Test
-	void testCreateWithCleanthatFormatter() {
-		assertEquals(NAME, RemoveUnusedImportsStep.create("cleanthat-javaparser-unnecessaryimport", (groupArtifact, version) -> Collections.emptySet()).getName());
-	}
-
-	@Test
-	void testCreateWithInvalidFormatter() {
-		assertThrows(IllegalArgumentException.class, () -> RemoveUnusedImportsStep.create("invalid-formatter", (groupArtifact, version) -> Collections.emptySet()));
-	}
-
-	@Test
-	void testCreateWithNullProvisioner() {
-		assertThrows(NullPointerException.class, () -> RemoveUnusedImportsStep.create("palantir-java-format", null));
-	}
-}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java
new file mode 100644
index 0000000000..3689fa8f98
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveUnusedImportsStepTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 RemoveUnusedImportsStepTest extends MavenIntegrationHarness {
+
+	@Test
+	void testRemoveUnusedInports() throws Exception {
+		writePomWithJavaSteps("<removeUnusedImports/>");
+
+		String path = "src/main/java/test.java";
+		setFile(path).toResource("java/removeunusedimports/JavaCodeWithPackageUnformatted.test");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("java/removeunusedimports/JavaCodeWithPackageFormatted.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 766816a659..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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 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 @@
 class RemoveUnusedImportsStep_withGoogleJavaFormatTest {
 	@Test
 	void behavior() throws Exception {
-		FormatterStep step = RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.DEFAULT_FORMATTER, 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")
@@ -48,7 +48,7 @@ protected void setupTest(API api) {
 
 			@Override
 			protected FormatterStep create() {
-				return RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.DEFAULT_FORMATTER, TestProvisioner.mavenCentral());
+				return RemoveUnusedImportsStep.create(RemoveUnusedImportsStep.GJF, TestProvisioner.mavenCentral());
 			}
 		}.testEquals();
 	}

From 62b12ca8fb2b17f04bf3028c97e73f99f682b5a9 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.236>
Date: Mon, 7 Jul 2025 14:03:03 -0700
Subject: [PATCH 170/210] spotlessApply

---
 .../com/diffplug/spotless/java/RemoveUnusedImportsStep.java     | 2 +-
 .../java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 753678a86b..71b6dc4281 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-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/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java b/testlib/src/test/java/com/diffplug/spotless/java/RemoveUnusedImportsStep_withGoogleJavaFormatTest.java
index 44699a8215..84ad3f1f61 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
@@ -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.

From 10c60698327c0b7a4ecebd76c7638f695389d83b Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmbietmlfzoi.igb3cs02yymuxlog0fzrenhqpd.bx.internal.cloudapp.net>
Date: Mon, 7 Jul 2025 21:42:26 +0000
Subject: [PATCH 171/210] Published lib/3.2.0

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

diff --git a/CHANGES.md b/CHANGES.md
index 735eca7576..a4f4bf2e70 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.2.0] - 2025-07-07
 ### Added
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))

From facaab50c74d0d4ce2f5afdd50a73907a3a1c875 Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmbietmlfzoi.igb3cs02yymuxlog0fzrenhqpd.bx.internal.cloudapp.net>
Date: Mon, 7 Jul 2025 21:43:29 +0000
Subject: [PATCH 172/210] Published gradle/7.1.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 6dce00628c..c35554a6eb 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.1.0] - 2025-07-07
 ### Added
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index f775bf58a8..b1ebab7878 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.4-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.1.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.4/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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/7.0.4/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.4/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.4/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.4/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.4/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.4/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.4/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.1.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.1.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.1.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.1.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.1.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.1.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.1.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.4/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.1.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
 
@@ -174,7 +174,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.4/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.1.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 {
@@ -386,8 +386,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.4/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.1.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.1.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`.
 
@@ -446,8 +446,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.4/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.4/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.1.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.1.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
@@ -546,7 +546,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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 {
@@ -578,7 +578,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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 {
@@ -614,7 +614,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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 {
@@ -650,7 +650,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.4/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.1.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.
 
@@ -682,7 +682,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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)).
@@ -703,7 +703,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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).
 
@@ -722,7 +722,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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 {
@@ -747,7 +747,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.4/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.1.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 {
@@ -786,7 +786,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.4/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.1.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 {
@@ -835,7 +835,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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 {
@@ -929,7 +929,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.4/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.1.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 {
@@ -992,7 +992,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.4/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.1.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 {
@@ -1112,7 +1112,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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 {
@@ -1144,7 +1144,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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 {
@@ -1180,7 +1180,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.4/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.1.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 {
@@ -1209,7 +1209,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.4/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.1.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 {
@@ -1642,7 +1642,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.4/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.1.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1728,9 +1728,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.4/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.1.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.4/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.1.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
@@ -1763,11 +1763,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.4/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.1.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.4/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.1.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 9b004d2533309c879376f5e03d5edf2030ee35a2 Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmbietmlfzoi.igb3cs02yymuxlog0fzrenhqpd.bx.internal.cloudapp.net>
Date: Mon, 7 Jul 2025 21:44:59 +0000
Subject: [PATCH 173/210] Published maven/2.45.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 bf06a01e06..e8e69c82f8 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.45.0] - 2025-07-07
 ### Added
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
 * Add support for removing wildcard imports via `removeWildcardImports` step. ([#2517](https://github.com/diffplug/spotless/pull/2517))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 2e5839e819..f03a2273a0 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.5-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.5/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.45.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.45.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From a8b51729d80b246696c18cf9be8580c7f471121d Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.236>
Date: Mon, 7 Jul 2025 17:03:56 -0700
Subject: [PATCH 174/210] Go back to the old names for the GitHub Secrets
 (modify #2539)

---
 .github/workflows/deploy.yml | 8 ++++----
 gradle/java-publish.gradle   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4a4672be17..ffc164a461 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,5 +1,5 @@
-# CENTRAL_PORTAL_USER
-# CENTRAL_PORTAL_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java
+# NEXUS_USER
+# 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);
@@ -32,8 +32,8 @@ jobs:
       contents: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      ORG_GRADLE_PROJECT_central_portal_user: ${{ secrets.CENTRAL_PORTAL_USER }}
-      ORG_GRADLE_PROJECT_central_portal_pass64: ${{ secrets.CENTRAL_PORTAL_PASS64 }}
+      ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}
+      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 2c26a692f3..52a6ae7137 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -11,7 +11,7 @@ def decode64(String varName) {
 
 if (project.parent == null) {
 	group = 'com.diffplug.spotless'
-	def pass = System.env['ORG_GRADLE_PROJECT_central_portal_pass64']
+	def pass = System.env['ORG_GRADLE_PROJECT_nexus_pass64']
 	if (pass != null) {
 		pass = pass.decodeBase64()
 	}
@@ -22,8 +22,8 @@ if (project.parent == null) {
 			sonatype {
 				nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
 				snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
-				username = System.env['ORG_GRADLE_PROJECT_central_portal_user']
-				password = decode64('ORG_GRADLE_PROJECT_central_portal_pass64')
+				username = System.env['ORG_GRADLE_PROJECT_nexus_user']
+				password = decode64('ORG_GRADLE_PROJECT_nexus_pass64')
 			}
 		}
 	}

From 38b0c7bc26698149c5a9ffb843df8f8f32c16396 Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Wed, 9 Jul 2025 18:58:14 +0200
Subject: [PATCH 175/210] biome step: Allow specifying path to JSON config file
 directly, requires biome 2.0 or higher

---
 CHANGES.md                                    |  2 +
 CONTRIBUTING.md                               |  2 +-
 .../spotless/biome/BiomeSettings.java         | 38 ++++++++
 .../diffplug/spotless/biome/BiomeStep.java    | 20 +++--
 plugin-gradle/CHANGES.md                      |  2 +
 plugin-gradle/README.md                       | 37 ++++++--
 .../gradle/spotless/BiomeStepConfig.java      |  7 +-
 .../gradle/spotless/BiomeIntegrationTest.java | 30 +++++++
 plugin-maven/CHANGES.md                       |  2 +
 plugin-maven/README.md                        | 29 +++++-
 .../spotless/maven/generic/AbstractBiome.java |  7 +-
 .../spotless/maven/biome/BiomeMavenTest.java  | 19 ++++
 .../spotless/biome/BiomeStepTest.java         | 90 ++++++++++++-------
 13 files changed, 225 insertions(+), 60 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a4f4bf2e70..0ec752f8cb 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
+* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x.
 
 ## [3.2.0] - 2025-07-07
 ### Added
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ee619f680..ec94bba693 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -163,7 +163,7 @@ If you get something running, we'd love to host your plugin within this repo as
 
 To run all tests, simply do
 
-> gradlew test
+> ./gradlew test
 
 Since that takes some time, you might only want to run the tests
 concerning what you are working on:
diff --git a/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java b/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
index 8bef764ba1..14157a6295 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeSettings.java
@@ -15,10 +15,15 @@
  */
 package com.diffplug.spotless.biome;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Settings and constants for Biome to use.
  */
 public final class BiomeSettings {
+	private static final Logger logger = LoggerFactory.getLogger(BiomeSettings.class);
+
 	private final static String CONFIG_NAME = "biome.json";
 	private final static String DEFAULT_VERSION = "1.2.0";
 	private final static String DOWNLOAD_FILE_PATTERN = "biome-%s-%s-%s";
@@ -72,4 +77,37 @@ public static String getUrlPattern(String version) {
 	public static String shortName() {
 		return SHORT_NAME;
 	}
+
+	/**
+	 * Checks if the version of Biome is equal to or higher than the given major, minor, and patch version.
+	 * @param version The version string to check, e.g. "1.2.3".
+	 * @param major The major version to compare against.
+	 * @param minor The minor version to compare against.
+	 * @param patch The patch version to compare against.
+	 * @return true if the version is higher than or equal to the given major, minor, and patch version,
+	 */
+	public static boolean versionHigherThanOrEqualTo(String version, int major, int minor, int patch) {
+		try {
+			final var versionParts = version.split("\\.");
+			if (versionParts.length < 3) {
+				return false;
+			}
+			final var actualMajor = Integer.parseInt(versionParts[0]);
+			final var actualMinor = Integer.parseInt(versionParts[1]);
+			final var actualPatch = Integer.parseInt(versionParts[2]);
+			if (actualMajor > major) {
+				return true;
+			}
+			if (actualMajor == major && actualMinor > minor) {
+				return true;
+			}
+			if (actualMajor == major && actualMinor == minor && actualPatch > patch) {
+				return true;
+			}
+			return actualMajor == major && actualMinor == minor && actualPatch == patch;
+		} catch (final Exception e) {
+			logger.warn("Failed to parse biome version string '{}'. Expected format is 'major.minor.patch'.", version, e);
+			return false;
+		}
+	}
 }
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 6993fcfaaf..2ebb9d75c5 100644
--- a/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java
@@ -191,18 +191,21 @@ 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.
+	 * @param configPath The path to validate.
+	 * @param version The version of Biome.
 	 */
-	private static void validateBiomeConfigPath(String configPath) {
+	private static void validateBiomeConfigPath(String configPath, String version) {
 		if (configPath == null) {
 			return;
 		}
+		var atLeastV2 = BiomeSettings.versionHigherThanOrEqualTo(version, 2, 0, 0);
 		var path = Paths.get(configPath);
-		var config = path.resolve(BiomeSettings.configName());
+		var configFile = Files.isRegularFile(path) && atLeastV2 ? path : path.resolve(BiomeSettings.configName());
 		if (!Files.exists(path)) {
 			throw new IllegalArgumentException("Biome config directory does not exist: " + path);
 		}
-		if (!Files.exists(config)) {
-			throw new IllegalArgumentException("Biome config does not exist: " + config);
+		if (!Files.exists(configFile)) {
+			throw new IllegalArgumentException("Biome config does not exist: " + configFile);
 		}
 	}
 
@@ -240,11 +243,10 @@ public FormatterStep create() {
 	}
 
 	/**
-	 * Sets the path to the directory with the {@code biome.json} config file. When
-	 * no config path is set, the default configuration is used.
+	 * Sets the path to the Biome configuration. Must be either a directory with a file named {@code biome.json}, or
+	 * a file with the Biome config as JSON. When no config path is set, the default configuration is used.
 	 *
-	 * @param configPath Config path to use. Must point to a directory which contains
-	 *                   a file named {@code biome.json}.
+	 * @param configPath Config path to use.
 	 * @return This builder instance for chaining method calls.
 	 */
 	public BiomeStep withConfigPath(String configPath) {
@@ -296,7 +298,7 @@ public BiomeStep withLanguage(String language) {
 	private State createState() throws IOException, InterruptedException {
 		var resolvedPathToExe = resolveExe();
 		validateBiomeExecutable(resolvedPathToExe);
-		validateBiomeConfigPath(configPath);
+		validateBiomeConfigPath(configPath, version);
 		logger.debug("Using Biome executable located at  '{}'", resolvedPathToExe);
 		var exeSignature = FileSignature.signAsList(Collections.singleton(new File(resolvedPathToExe)));
 		makeExecutable(resolvedPathToExe);
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c35554a6eb..d31dfa4ae3 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
+* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x.
 
 ## [7.1.0] - 2025-07-07
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index b1ebab7878..1fa7519a8c 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -1432,14 +1432,14 @@ spotless {
     target 'src/*/webapp/**/*.js'
 
     // Download Biome from the network if not already downloaded, see below for more info
-    biome('1.2.0')
+    biome('2.1.0')
 
     // (optional) Path to the directory with the biome.json conig file
-    biome('1.2.0').configPath("path/config/dir")
+    biome('2.1.0').configPath("path/config/dir")
 
     // (optional) Biome will auto detect the language based on the file extension.
     // See below for possible values.
-    biome('1.2.0').language("js")
+    biome('2.1.0').language("js")
   }
 }
 ```
@@ -1451,15 +1451,15 @@ more formats:
 spotless {
   format 'biome-js', {
     target '**/*.js'
-    biome('1.2.0')
+    biome('2.1.0')
   }
   format 'biome-ts', {
     target '**/*.ts'
-    biome('1.2.0')
+    biome('2.1.0')
   }
   format 'biome-json', {
     target '**/*.json'
-    biome('1.2.0')
+    biome('2.1.0')
   }
 }
 ```
@@ -1476,6 +1476,7 @@ 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.
 
@@ -1553,7 +1554,29 @@ spotless {
     target '**/*.js','**/*.ts','**/*.json'
     // Must point to the directory with the "biome.json" config file -->
     // Relative paths are resolved against the project's base directory -->
-    biome('1.2.0').configPath('./config')
+    biome('2.1.0').configPath('./config')
+  }
+}
+```
+
+__If spotless does not format any files__, this might be because you excluded those files in you biome.json
+configuration file. If you are using biome 2.x, you can create a custom config file for spotless and inherit from
+your main config file like this:
+
+```jsonc
+// biome-spotless.json
+{
+  "extends": "./biome.json",
+  "include": ["**"]
+}
+```
+
+Then simply specify the path to this file in your spotless configuration:
+
+```gradle
+spotless {
+  format 'biome', {
+    biome('2.1.0').configPath('./config/biome-spotless.json')
   }
 }
 ```
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 49aeb28fc0..4767e5112a 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
@@ -31,10 +31,9 @@
 
 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
-	 * configuration is used. If this is a relative path, it is resolved against the
-	 * project's base directory.
+	 * Optional path to the configuration file for Biome. Must be either a directory that contains a file named
+	 * {@code biome.json}, or a file that contains the Biome config as 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;
 
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 8e4da27e95..02ef09ec01 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,6 +19,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.File;
+
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;
 
@@ -230,6 +232,34 @@ void configPathAbsolute() throws Exception {
 		assertFile("biome_test.js").sameAsResource("biome/js/longLineAfter120.js");
 	}
 
+	/**
+	 * Tests that a path to a Biome config JSON file can be specified (requires biome 2.x).
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathFile() throws Exception {
+		var path = newFile("configs").getAbsolutePath();
+		var file = new File(path, "biome.json").getAbsolutePath();
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mybiome', {",
+				"        target '**/*.js'",
+				"        biome('2.1.0').configPath('" + Encode.forJava(file) + "')",
+				"    }",
+				"}");
+		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.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e8e69c82f8..eb4695a891 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
+* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x.
 
 ## [2.45.0] - 2025-07-07
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f03a2273a0..f633ca5635 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -1530,9 +1530,9 @@ Note regarding CSS: Biome supports formatting CSS as of 1.8.0 (experimental, opt
 
       <biome>
         <!-- Download Biome from the network if not already downloaded, see below for more info  -->
-        <version>1.2.0</version>
+        <version>2.1.1</version>
 
-        <!-- (optional) Path to the directory with the biome.json conig file -->
+        <!-- (optional) Path to the directory with the biome.json config file -->
         <configPath>${project.basedir}/path/to/config/dir</configPath>
 
         <!-- (optional) Biome will auto-detect the language based on the file extension. -->
@@ -1583,7 +1583,7 @@ To download the Biome binary from the network, just specify a version:
 
 ```xml
 <biome>
-  <version>1.2.0</version>
+  <version>2.1.0</version>
 </biome>
 ```
 
@@ -1594,7 +1594,7 @@ Biome binaries (defaults to `~/.m2/repository/com/diffplug/spotless/spotless-dat
 
 ```xml
 <biome>
-  <version>1.2.0</version>
+  <version>2.1.0</version>
   <!-- Relative paths are resolved against the project's base directory -->
   <downloadDir>${user.home}/biome</downloadDir>
 </biome>
@@ -1631,10 +1631,31 @@ Biome is used. To use a custom configuration:
 <biome>
   <!-- Must point to the directory with the "biome.json" config file -->
   <!-- Relative paths are resolved against the project's base directory -->
+  <!-- Starting with biome 2.x, you can also pass the path to a JSON config file directly. -->
   <configPath>${project.basedir}</configPath>
 </biome>
 ```
 
+__If spotless does not format any files__, this might be because you excluded those files in you biome.json
+configuration file. If you are using biome 2.x, you can create a custom config file for spotless and inherit from
+your main config file like this:
+
+```jsonc
+// biome-spotless.json
+{
+  "extends": "./biome.json",
+  "include": ["**"]
+}
+```
+
+Then simply specify the path to this file in your spotless configuration:
+
+```xml
+<biome>
+  <configPath>${project.basedir}/biome-spotless.json</configPath>
+</biome>
+```
+
 ### Biome input language
 
 By default, Biome detects the language / syntax of the files to format
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 465965f896..3d1cf82ca4 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
@@ -37,10 +37,9 @@ public abstract class AbstractBiome implements FormatterStepFactory {
 	protected AbstractBiome() {}
 
 	/**
-	 * 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.
+	 * Optional path to the configuration file for Biome. Must be either a directory that contains a file named
+	 * {@code biome.json}, or a file that contains the Biome config as 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;
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 1072a95da8..4197b623dc 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,6 +20,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.owasp.encoder.Encode.forXml;
 
+import java.io.File;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
@@ -139,6 +141,23 @@ void configPathAbsolute() throws Exception {
 		assertFile("biome_test.js").sameAsResource("biome/js/longLineAfter120.js");
 	}
 
+	/**
+	 * Tests that a path to a Biome config JSON file can be specified (requires biome 2.x).
+	 *
+	 * @throws Exception When a test failure occurs.
+	 */
+	@Test
+	void configPathFile() throws Exception {
+		var path = newFile("configs").getAbsolutePath();
+		var file = new File(path, "biome.json").getAbsolutePath();
+		writePomWithBiomeSteps("**/*.js",
+				"<biome><version>2.1.1</version><configPath>" + forXml(file) + "</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.
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 db6c535835..090c898df8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/biome/BiomeStepTest.java
@@ -15,8 +15,11 @@
  */
 package com.diffplug.spotless.biome;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.junit.jupiter.api.BeforeAll;
@@ -53,7 +56,7 @@ class AutoDetectLanguage {
 		 */
 		@Test
 		void testAutoDetectCjs() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
 		}
@@ -64,7 +67,7 @@ void testAutoDetectCjs() {
 		 */
 		@Test
 		void testAutoDetectCts() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
 		}
@@ -76,7 +79,7 @@ void testAutoDetectCts() {
 		@Test
 		void testAutoDetectCssExperimental() {
 			var path = createBiomeConfig("biome/config/css-enabled.json");
-			var step = BiomeStep.withExeDownload("1.8.3", downloadDir.toString()).withConfigPath(path).create();
+			var step = BiomeStep.withExeDownload("1.8.3", downloadDir).withConfigPath(path.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
 		}
@@ -87,7 +90,7 @@ void testAutoDetectCssExperimental() {
 		 */
 		@Test
 		void testAutoDetectCssStable() {
-			var step = BiomeStep.withExeDownload("1.9.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.9.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
 		}
@@ -98,7 +101,7 @@ void testAutoDetectCssStable() {
 		 */
 		@Test
 		void testAutoDetectJs() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
 		}
@@ -109,7 +112,7 @@ void testAutoDetectJs() {
 		 */
 		@Test
 		void testAutoDetectJson() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
 		}
@@ -120,7 +123,7 @@ void testAutoDetectJson() {
 		 */
 		@Test
 		void testAutoDetectJsonc() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/jsonc/fileBefore.jsonc", "biome/jsonc/fileAfter.jsonc");
 		}
@@ -131,7 +134,7 @@ void testAutoDetectJsonc() {
 		 */
 		@Test
 		void testAutoDetectJsx() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
 		}
@@ -142,7 +145,7 @@ void testAutoDetectJsx() {
 		 */
 		@Test
 		void testAutoDetectMjs() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
 		}
@@ -153,7 +156,7 @@ void testAutoDetectMjs() {
 		 */
 		@Test
 		void testAutoDetectMts() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
 		}
@@ -164,7 +167,7 @@ void testAutoDetectMts() {
 		 */
 		@Test
 		void testAutoDetectTs() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
 		}
@@ -175,7 +178,7 @@ void testAutoDetectTs() {
 		 */
 		@Test
 		void testAutoDetectTsx() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.tsx", "biome/ts/fileAfter.tsx");
 		}
@@ -188,7 +191,7 @@ void testAutoDetectTsx() {
 		 */
 		@Test
 		void preservesIgnoredFiles() {
-			var step = BiomeStep.withExeDownload("1.5.0", downloadDir.toString()).create();
+			var step = BiomeStep.withExeDownload("1.5.0", downloadDir).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/json/package.json", "biome/json/packageAfter.json");
 		}
@@ -228,7 +231,7 @@ class ConfigFile {
 		@Test
 		void testLineWidth120() {
 			var path = createBiomeConfig("biome/config/line-width-120.json");
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withConfigPath(path).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withConfigPath(path.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter120.js");
 		}
@@ -239,11 +242,36 @@ void testLineWidth120() {
 		@Test
 		void testLineWidth80() {
 			var path = createBiomeConfig("biome/config/line-width-80.json");
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withConfigPath(path).create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withConfigPath(path.toString()).create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter80.js");
 		}
 
+		/**
+		 * Test the path to the JSON config file can be specified directly (requires biome 2.x).
+		 */
+		@Test
+		void testPathToFile() {
+			var path = createBiomeConfig("biome/config/line-width-80.json").resolve("biome.json");
+			assertTrue(Files.isRegularFile(path));
+			assertTrue(Files.exists(path));
+			var step = BiomeStep.withExeDownload("2.1.1", downloadDir).withConfigPath(path.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter80.js");
+		}
+
+		/**
+		 * Test the path to the folder with the biome.json config file can be specified.
+		 */
+		@Test
+		void testPathToDirectory() {
+			var path = createBiomeConfig("biome/config/line-width-80.json");
+			assertTrue(Files.isDirectory(path));
+			assertTrue(Files.exists(path));
+			var step = BiomeStep.withExeDownload("2.1.1", downloadDir).withConfigPath(path.toString()).create();
+			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
+			stepHarness.testResource("biome/js/longLineBefore.js", "biome/js/longLineAfter80.js");
+		}
 	}
 
 	/**
@@ -257,7 +285,7 @@ class ExplicitLanguage {
 		 */
 		@Test
 		void testSetLanguageCjs() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("js").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.cjs", "biome/js/fileAfter.cjs");
 		}
@@ -269,7 +297,7 @@ void testSetLanguageCjs() {
 		@Test
 		void testSetLanguageCssExperimental() {
 			var path = createBiomeConfig("biome/config/css-enabled.json");
-			var step = BiomeStep.withExeDownload("1.8.3", downloadDir.toString()).withConfigPath(path).withLanguage("css").create();
+			var step = BiomeStep.withExeDownload("1.8.3", downloadDir).withConfigPath(path.toString()).withLanguage("css").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
 		}
@@ -280,7 +308,7 @@ void testSetLanguageCssExperimental() {
 		 */
 		@Test
 		void testSetLanguageCssStable() {
-			var step = BiomeStep.withExeDownload("1.9.0", downloadDir.toString()).withLanguage("css").create();
+			var step = BiomeStep.withExeDownload("1.9.0", downloadDir).withLanguage("css").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/css/fileBefore.css", "biome/css/fileAfter.css");
 		}
@@ -291,7 +319,7 @@ void testSetLanguageCssStable() {
 		 */
 		@Test
 		void testSetLanguageCts() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("ts").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.cts", "biome/ts/fileAfter.cts");
 		}
@@ -302,7 +330,7 @@ void testSetLanguageCts() {
 		 */
 		@Test
 		void testSetLanguageJs() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("js").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.js", "biome/js/fileAfter.js");
 		}
@@ -313,7 +341,7 @@ void testSetLanguageJs() {
 		 */
 		@Test
 		void testSetLanguageJson() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("json").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("json").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/json/fileBefore.json", "biome/json/fileAfter.json");
 		}
@@ -324,7 +352,7 @@ void testSetLanguageJson() {
 		 */
 		@Test
 		void testSetLanguageJsonc() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("jsonc").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("jsonc").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/jsonc/fileBefore.jsonc", "biome/jsonc/fileAfter.jsonc");
 		}
@@ -335,7 +363,7 @@ void testSetLanguageJsonc() {
 		 */
 		@Test
 		void testSetLanguageJsx() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("jsx").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("jsx").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.jsx", "biome/js/fileAfter.jsx");
 		}
@@ -346,7 +374,7 @@ void testSetLanguageJsx() {
 		 */
 		@Test
 		void testSetLanguageMjs() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("js").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("js").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/js/fileBefore.mjs", "biome/js/fileAfter.mjs");
 		}
@@ -357,7 +385,7 @@ void testSetLanguageMjs() {
 		 */
 		@Test
 		void testSetLanguageMts() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("ts").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.mts", "biome/ts/fileAfter.mts");
 		}
@@ -368,7 +396,7 @@ void testSetLanguageMts() {
 		 */
 		@Test
 		void testSetLanguageTs() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("ts").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).withLanguage("ts").create();
 			var stepHarness = StepHarnessWithFile.forStep(BiomeStepTest.this, step);
 			stepHarness.testResource("biome/ts/fileBefore.ts", "biome/ts/fileAfter.ts");
 		}
@@ -379,17 +407,17 @@ void testSetLanguageTs() {
 		 */
 		@Test
 		void testSetLanguageTsx() {
-			var step = BiomeStep.withExeDownload("1.2.0", downloadDir.toString()).withLanguage("tsx").create();
+			var step = BiomeStep.withExeDownload("1.2.0", downloadDir).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) {
+	private Path 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();
+		var biomeConfig = dir.resolve("biome.json");
+		ThrowingEx.run(() -> Files.copy(config, biomeConfig));
+		return dir;
 	}
 }

From b79b2d37c8078cc29e57f7866f583c46ae099ebb Mon Sep 17 00:00:00 2001
From: Andre Wachsmuth <awa@xima.de>
Date: Wed, 9 Jul 2025 19:10:56 +0200
Subject: [PATCH 176/210] Add link to PR to CHANGES.md

---
 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 0ec752f8cb..65635901eb 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
-* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x.
+* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
 
 ## [3.2.0] - 2025-07-07
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index d31dfa4ae3..80b05e796f 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
-* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x.
+* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
 
 ## [7.1.0] - 2025-07-07
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index eb4695a891..2c801e3c2c 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
-* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x.
+* Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
 
 ## [2.45.0] - 2025-07-07
 ### Added

From f65f0bf2864ad9aeec861b17dea48a531f58e00d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 05:18:50 +0000
Subject: [PATCH 177/210] fix(deps): update dependency
 com.google.code.gson:gson to v2.13.1 (#2414)

* fix(deps): update dependency com.google.code.gson:gson to v2.13.1

* Updates

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                    | 3 +++
 lib/build.gradle                                              | 2 +-
 .../main/java/com/diffplug/spotless/json/gson/GsonStep.java   | 4 ++--
 plugin-gradle/CHANGES.md                                      | 3 +++
 plugin-maven/CHANGES.md                                       | 3 +++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a4f4bf2e70..4229bc511b 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]
 
+## Changed
+* Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
+
 ## [3.2.0] - 2025-07-07
 ### Added
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
diff --git a/lib/build.gradle b/lib/build.gradle
index 4f4addc2d5..115e5be32a 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -96,7 +96,7 @@ dependencies {
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.24.0'
 	// gson
-	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
+	gsonCompileOnly 'com.google.code.gson:gson:2.13.1'
 	// jackson
 	String VER_JACKSON='2.18.1'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
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 a690b02b95..31634afa88 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-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.
@@ -30,7 +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";
+	public static final String DEFAULT_VERSION = "2.13.1";
 
 	private final JarState.Promised jarState;
 	private final GsonConfig gsonConfig;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c35554a6eb..d2a80d31fd 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]
 
+## Changed
+* Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
+
 ## [7.1.0] - 2025-07-07
 ### Added
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e8e69c82f8..5fd50571d4 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]
 
+## Changed
+* Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
+
 ## [2.45.0] - 2025-07-07
 ### Added
 * Support for `idea` ([#2020](https://github.com/diffplug/spotless/pull/2020), [#2535](https://github.com/diffplug/spotless/pull/2535))

From a73d5b9e7144438541bc817e34ce8de85929cb6e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 14:02:58 +0800
Subject: [PATCH 178/210] chore(deps): update dependency gradle to v8.14.3
 (#2549)

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 ff23a68d70..d4081da476 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.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From f5639f1b3ef27d9e9b2173e40d61917c11e9a2cc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 06:17:38 +0000
Subject: [PATCH 179/210] fix(deps): update jackson monorepo to v2.19.1 (#2352)

* fix(deps): update jackson monorepo to v2.19.1

* Updates

---------

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 | 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 4229bc511b..ded3ad58c8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
+* Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
 
 ## [3.2.0] - 2025-07-07
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index 115e5be32a..47ff1ca1a3 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -98,7 +98,7 @@ dependencies {
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.13.1'
 	// jackson
-	String VER_JACKSON='2.18.1'
+	String VER_JACKSON='2.19.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 a4d264b4f0..d8f395129e 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-2024 DiffPlug
+ * Copyright 2021-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,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.1";
+	private static final String DEFAULT_VERSION = "2.19.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 d2a80d31fd..5394d24832 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
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
+* Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
 
 ## [7.1.0] - 2025-07-07
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5fd50571d4..1c7d2e2b0c 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 (
 
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
+* Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
 
 ## [2.45.0] - 2025-07-07
 ### Added

From b08ccfcb162b53df7ea1c784ef9a6f787bad428c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 06:32:23 +0000
Subject: [PATCH 180/210] fix(deps): update dependency
 io.cucumber:gherkin-utils to v9.2.0 (#2408)

* fix(deps): update dependency io.cucumber:gherkin-utils to v9.2.0

* Updates

---------

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/gherkin/GherkinUtilsStep.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 ded3ad58c8..301bb5da0e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
+* Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
 
 ## [3.2.0] - 2025-07-07
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index 47ff1ca1a3..f44d92e645 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -91,7 +91,7 @@ dependencies {
 	// flexmark
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.8'
 	// gherkin
-	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
+	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.2.0'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.17'
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.24.0'
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 63cdd7a786..4f606332d0 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-2024 DiffPlug
+ * Copyright 2021-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,7 +28,7 @@
 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";
+	private static final String DEFAULT_VERSION = "9.2.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 5394d24832..5ab73ecbd2 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 (
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
+* Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
 
 ## [7.1.0] - 2025-07-07
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1c7d2e2b0c..f361e062de 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 (
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
+* Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
 
 ## [2.45.0] - 2025-07-07
 ### Added

From 6404c075d526a81c1f3a91987f8e26f060416f00 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 06:33:52 +0000
Subject: [PATCH 181/210] fix(deps): update dependency
 org.junit.jupiter:junit-jupiter to v5.13.3 (#2551)

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 1ef2017082..fa9e23c117 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.1.202505221210-r
-VER_JUNIT=5.13.1
+VER_JUNIT=5.13.3
 VER_ASSERTJ=3.27.3
 VER_MOCKITO=5.18.0
 VER_SELFIE=2.5.3
\ No newline at end of file

From 3aef1b411e7afd2a8c28d17ab2f483985e06c9a4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 06:47:07 +0000
Subject: [PATCH 182/210] chore(deps): update plugin com.diffplug.spotless to
 v7.1.0 (#2552)

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 c6831e1b4d..8c67f9681e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '7.0.4' apply false
+	id 'com.diffplug.spotless' version '7.1.0' 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

From 433c58006df7bd0f2393cc89f09ce497ab2c11a5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 15:28:00 +0800
Subject: [PATCH 183/210] fix(deps): update dependency
 org.eclipse.platform:org.eclipse.osgi to v3.23.100 (#2550)

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 880830740b..0b727ef8e2 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.23.0"
+	implementation "org.eclipse.platform:org.eclipse.osgi:3.23.100"
 
 	// testing
 	testImplementation projects.testlib

From 7fbb6c840c560e8c44dfcb26f46eb0f385dabc26 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 08:25:36 +0000
Subject: [PATCH 184/210] chore(deps): update plugin com.github.spotbugs to
 v6.2.2 (#2509)

* chore(deps): update plugin com.github.spotbugs to v6.2.2

* Configure spotbugs-exclude.xml to exclude `THROWS_METHOD_THROWS_RUNTIMEEXCEPTION`

* Remove extra SuppressFBWarnings

* Suppress THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION

* Suppress things for lib-extra as well

* Remove extra SuppressFBWarnings in lib-extra

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 lib-extra/build.gradle                                    | 1 +
 lib-extra/spotbugs-exclude.xml                            | 8 ++++++++
 .../diffplug/spotless/extra/GitAttributesLineEndings.java | 1 -
 lib/build.gradle                                          | 1 +
 lib/spotbugs-exclude.xml                                  | 8 ++++++++
 .../com/diffplug/spotless/ConfigurationCacheHackList.java | 3 ---
 .../main/java/com/diffplug/spotless/ProcessRunner.java    | 5 +----
 .../main/java/com/diffplug/spotless/SpotlessCache.java    | 6 +-----
 .../java/com/diffplug/spotless/generic/FenceStep.java     | 3 ---
 .../java/com/diffplug/spotless/java/ImportOrderStep.java  | 5 +----
 settings.gradle                                           | 2 +-
 11 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 lib-extra/spotbugs-exclude.xml
 create mode 100644 lib/spotbugs-exclude.xml

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 0b727ef8e2..a4749cc859 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -102,4 +102,5 @@ p2deps {
 spotbugs {
 	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
 	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
+	excludeFilter = file("spotbugs-exclude.xml")
 }
diff --git a/lib-extra/spotbugs-exclude.xml b/lib-extra/spotbugs-exclude.xml
new file mode 100644
index 0000000000..fd9367044a
--- /dev/null
+++ b/lib-extra/spotbugs-exclude.xml
@@ -0,0 +1,8 @@
+<FindBugsFilter>
+	<Match>
+		<Bug pattern="THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION"/>
+	</Match>
+	<Match>
+		<Bug pattern="THROWS_METHOD_THROWS_RUNTIMEEXCEPTION"/>
+	</Match>
+</FindBugsFilter>
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 0e058566f2..85d8416c0b 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
@@ -188,7 +188,6 @@ static class RuntimeInit {
 		/** git worktree root, might not exist if we're not in a git repo. */
 		final @Nullable File workTree;
 
-		@SuppressFBWarnings("SIC_INNER_SHOULD_BE_STATIC_ANON")
 		RuntimeInit(File projectDir) {
 			/////////////////////////////////
 			// USER AND SYSTEM-WIDE VALUES //
diff --git a/lib/build.gradle b/lib/build.gradle
index f44d92e645..11b959b6c6 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -139,6 +139,7 @@ dependencies {
 spotbugs {
 	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
 	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
+	excludeFilter = file("spotbugs-exclude.xml")
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
diff --git a/lib/spotbugs-exclude.xml b/lib/spotbugs-exclude.xml
new file mode 100644
index 0000000000..fd9367044a
--- /dev/null
+++ b/lib/spotbugs-exclude.xml
@@ -0,0 +1,8 @@
+<FindBugsFilter>
+	<Match>
+		<Bug pattern="THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION"/>
+	</Match>
+	<Match>
+		<Bug pattern="THROWS_METHOD_THROWS_RUNTIMEEXCEPTION"/>
+	</Match>
+</FindBugsFilter>
diff --git a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
index 39be0d9559..58794fd588 100644
--- a/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
+++ b/lib/src/main/java/com/diffplug/spotless/ConfigurationCacheHackList.java
@@ -24,8 +24,6 @@
 
 import com.diffplug.spotless.yaml.SerializeToByteArrayHack;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Gradle requires three things:
  * - Gradle defines cache equality based on your serialized representation
@@ -78,7 +76,6 @@ 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 {
 		boolean serializeToByteArrayFirst = in.readBoolean();
 		optimizeForEquality = in.readBoolean();
diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index e7755f75bd..c6dd44ca7b 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-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.
@@ -37,8 +37,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * 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
@@ -195,7 +193,6 @@ private void checkState() {
 		}
 	}
 
-	@SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
 	public static class Result {
 		private final List<String> args;
 		private final int exitCode;
diff --git a/lib/src/main/java/com/diffplug/spotless/SpotlessCache.java b/lib/src/main/java/com/diffplug/spotless/SpotlessCache.java
index 237e326482..9828b7d748 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-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.
@@ -30,8 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Spotless' global cache. {@link SpotlessCache#clear()} should be called
  * when Spotless is no longer in use to release any resources it has grabbed.
@@ -64,12 +62,10 @@ public final int hashCode() {
 
 	final Map<SerializedKey, URLClassLoader> cache = new HashMap<>();
 
-	@SuppressFBWarnings("DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED")
 	synchronized ClassLoader classloader(JarState state) {
 		return classloader(state, state);
 	}
 
-	@SuppressFBWarnings("DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED")
 	synchronized ClassLoader classloader(Serializable key, JarState state) {
 		SerializedKey serializedKey = new SerializedKey(key);
 		return cache
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 7d98219231..7cda2e4905 100644
--- a/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java
@@ -31,8 +31,6 @@
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.Lint;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 public class FenceStep {
 	/** Declares the name of the step. */
 	public static FenceStep named(String name) {
@@ -135,7 +133,6 @@ public BaseFormatter toFormatterFunc() {
 		}
 	}
 
-	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	private static class BaseFormatter implements FormatterFunc.NeedsFile, FormatterFunc.Closeable {
 		final Kind kind;
 		final Pattern regex;
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 1e2c8a81c8..7f2aa7ec4d 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-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.
@@ -40,8 +40,6 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.SerializedFunction;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 public final class ImportOrderStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
@@ -94,7 +92,6 @@ private FormatterStep createFrom(boolean wildcardsLast, boolean semanticSort, Se
 				State::toFormatter);
 	}
 
-	@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE") // workaround https://github.com/spotbugs/spotbugs/issues/756
 	private static List<String> getImportOrder(File importsFile) {
 		try (Stream<String> lines = Files.lines(importsFile.toPath())) {
 			return lines.filter(line -> !line.startsWith("#"))
diff --git a/settings.gradle b/settings.gradle
index 8c67f9681e..c0b1b241b0 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.13' apply false
+	id 'com.github.spotbugs' version '6.2.2' 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 03a4cd248346a5a34dba7e726b08c2f5347cddbc Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Mon, 14 Jul 2025 14:29:10 +0800
Subject: [PATCH 185/210] Test on Java 24 (#2473)

* Add Java 24 into test matrix

* Fix `ErrorShouldRethrowTest` by disabling some ones running on Java 24
---
 .github/workflows/ci.yml                                   | 2 +-
 .../diffplug/gradle/spotless/ErrorShouldRethrowTest.java   | 7 ++++++-
 .../diffplug/gradle/spotless/GradleIntegrationHarness.java | 7 +++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 051f9802c5..dba0ec1d89 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, 23]
+        jre: [11, 17, 21, 24]
         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/ErrorShouldRethrowTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java
index e083161a09..ebd4bcbbf2 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-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,6 +15,8 @@
  */
 package com.diffplug.gradle.spotless;
 
+import static org.junit.jupiter.api.condition.JRE.JAVA_23;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,6 +24,7 @@
 
 import org.gradle.testkit.runner.BuildResult;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 import com.diffplug.selfie.Selfie;
 import com.diffplug.selfie.StringSelfie;
@@ -57,6 +60,7 @@ void passesIfNoException() throws Exception {
 	}
 
 	@Test
+	@EnabledForJreRange(max = JAVA_23) // `[Incubating] Problems report is available at` presents in the output from Java 24 or above.
 	void anyExceptionShouldFail() throws Exception {
 		writeBuild(
 				"    } // format",
@@ -105,6 +109,7 @@ void unlessExemptedByPath() throws Exception {
 	}
 
 	@Test
+	@EnabledForJreRange(max = JAVA_23) // `[Incubating] Problems report is available at` presents in the output from Java 24 or above.
 	void failsIfNeitherStepNorFileExempted() throws Exception {
 		writeBuild(
 				"        ignoreErrorForStep 'nope'",
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 100bdefc50..21fef4bc27 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-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,11 @@ public enum GradleVersionSupport {
 		GradleVersionSupport(String version) {
 			String minVersionForRunningJRE;
 			switch (Jvm.version()) {
-			case 24:
+			case 25:
 				// TODO: https://docs.gradle.org/current/userguide/compatibility.html
+			case 24:
+				minVersionForRunningJRE = "8.14";
+				break;
 			case 23:
 				minVersionForRunningJRE = "8.10";
 				break;

From 3893580f4100f66123f0f5f9a45162fab7022324 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Mon, 14 Jul 2025 17:28:13 +0800
Subject: [PATCH 186/210] TODO Gradle issue 22600 (#2554)

---
 plugin-gradle/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index 5211428f8b..5c16c64422 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -34,6 +34,7 @@ tasks.withType(Test).configureEach {
 	testLogging.showStandardStreams = true
 }
 tasks.validatePlugins {
+	// TODO: https://github.com/gradle/gradle/issues/22600
 	enableStricterValidation = true
 }
 

From 7203e24a4574927aaaa9e146a59d59f62e78ba35 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 12:48:42 +0800
Subject: [PATCH 187/210] fix(deps): update dependency
 io.github.solven-eu.cleanthat:java to v2.23 (#2556)

* fix(deps): update dependency io.github.solven-eu.cleanthat:java to v2.23

* Updates

---------

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/CleanthatJavaStep.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 301bb5da0e..164ba9a6c6 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 `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
 * Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
+* Bump default `cleanthat` version to latest `2.22` -> `2.23`. ([#2556](https://github.com/diffplug/spotless/pull/2556))
 
 ## [3.2.0] - 2025-07-07
 ### Added
diff --git a/lib/build.gradle b/lib/build.gradle
index 11b959b6c6..16477b066c 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -81,7 +81,7 @@ dependencies {
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat
-	String VER_CLEANTHAT='2.22'
+	String VER_CLEANTHAT='2.23'
 	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 2762bbeaf9..7790c8b06a 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-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.
@@ -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.22");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "2.23");
 
 	private final JarState.Promised jarState;
 	private final String version;
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 5ab73ecbd2..d202ad6443 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 (
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
 * Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
+* Bump default `cleanthat` version to latest `2.22` -> `2.23`. ([#2556](https://github.com/diffplug/spotless/pull/2556))
 
 ## [7.1.0] - 2025-07-07
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index f361e062de..22ae1e293d 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 `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
 * Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
+* Bump default `cleanthat` version to latest `2.22` -> `2.23`. ([#2556](https://github.com/diffplug/spotless/pull/2556))
 
 ## [2.45.0] - 2025-07-07
 ### Added

From e6e9a075b8cf97f871254da5f12adc922e331b2b Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Fri, 11 Jul 2025 23:17:35 -0700
Subject: [PATCH 188/210] add git pre push hook

---
 CHANGES.md                                    |   1 +
 .../spotless/GitPrePushHookInstaller.java     | 169 ++++++++++++++++++
 .../GitPrePushHookInstallerGradle.java        |  42 +++++
 .../GitPrePushHookInstallerMaven.java         |  32 ++++
 plugin-gradle/CHANGES.md                      |   3 +
 .../gradle/spotless/SpotlessExtension.java    |   3 +
 .../spotless/SpotlessExtensionImpl.java       |   6 +-
 .../SpotlessInstallPrePushHookTask.java       |  46 +++++
 .../SpotlessInstallPrePushHookTaskTest.java   |  70 ++++++++
 plugin-maven/CHANGES.md                       |   3 +
 .../spotless/maven/AbstractSpotlessMojo.java  |   1 +
 .../maven/SpotlessInstallPrePushHookMojo.java |  63 +++++++
 .../SpotlessInstallPrePushHookMojoTest.java   |  69 +++++++
 .../resources/git_pre_hook/pre-push.created   |  12 ++
 .../resources/git_pre_hook/pre-push.existing  |  51 ++++++
 .../git_pre_hook/pre-push.existing-added      |  62 +++++++
 .../spotless/GitPrePushHookInstallerTest.java | 148 +++++++++++++++
 17 files changed, 780 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
 create mode 100644 lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
 create mode 100644 plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
 create mode 100644 testlib/src/main/resources/git_pre_hook/pre-push.created
 create mode 100644 testlib/src/main/resources/git_pre_hook/pre-push.existing
 create mode 100644 testlib/src/main/resources/git_pre_hook/pre-push.existing-added
 create mode 100644 testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java

diff --git a/CHANGES.md b/CHANGES.md
index e98e32f712..a57d1c1e2c 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
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
+- `GitPrePushHookInstaller`, a reusable library component for installing a Git `pre-push` hook that runs formatter checks.
 
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
new file mode 100644
index 0000000000..a317689b35
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
@@ -0,0 +1,169 @@
+package com.diffplug.spotless;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+
+/**
+ * Abstract class responsible for installing a Git pre-push hook in a repository.
+ * This class ensures that specific checks and logic are run before a push operation in Git.
+ *
+ * Subclasses should define specific behavior for hook installation by implementing the required abstract methods.
+ */
+public abstract class GitPrePushHookInstaller {
+
+	/**
+	 * Logger for recording informational and error messages during the installation process.
+	 */
+	protected final GitPreHookLogger logger;
+
+	/**
+	 * The root directory of the Git repository where the hook will be installed.
+	 */
+	protected final File root;
+
+	/**
+	 * Constructor to initialize the GitPrePushHookInstaller with a logger and repository root path.
+	 *
+	 * @param logger The logger for recording messages.
+	 * @param root   The root directory of the Git repository.
+	 */
+	public GitPrePushHookInstaller(GitPreHookLogger logger, File root) {
+		this.logger = logger;
+		this.root = root;
+	}
+
+	/**
+	 * Installs the Git pre-push hook into the repository.
+	 *
+	 * <p>This method checks for the following:
+	 * <ul>
+	 *   <li>Ensures Git is installed and the `.git/config` file exists.</li>
+	 *   <li>Checks if an executor required by the hook is available.</li>
+	 *   <li>Creates and writes the pre-push hook file if it does not exist.</li>
+	 *   <li>Skips installation if the hook is already installed.</li>
+	 * </ul>
+	 * If an issue occurs during installation, error messages are logged.
+	 *
+	 * @throws Exception if any error occurs during installation.
+	 */
+	public void install() throws Exception {
+		logger.info("Installing git pre-push hook");
+
+		if (!isGitInstalled()) {
+			logger.error("Git not found in root directory");
+			return;
+		}
+
+		if (!isExecutorInstalled()) {
+			return;
+		}
+
+		var hookContent = "";
+		final var gitHookFile = root.toPath().resolve(".git/hooks/pre-push").toFile();
+		if (!gitHookFile.exists()) {
+			logger.info("Git pre-push hook not found, creating it");
+			gitHookFile.getParentFile().mkdirs();
+			if (!gitHookFile.createNewFile()) {
+				logger.error("Failed to create pre-push hook file");
+				return;
+			}
+
+			if (!gitHookFile.setExecutable(true, false)) {
+				logger.error("Can not make file executable");
+				return;
+			}
+
+			hookContent += "#!/bin/sh\n";
+		}
+
+		if (isGitHookInstalled(gitHookFile)) {
+			logger.info("Skipping, git pre-push hook already installed %s", gitHookFile.getAbsolutePath());
+			return;
+		}
+
+		hookContent += preHookContent();
+		writeFile(gitHookFile, hookContent);
+
+		logger.info("Git pre-push hook installed successfully to the file %s", gitHookFile.getAbsolutePath());
+	}
+
+	/**
+	 * Checks if the required executor for performing the desired pre-push actions is installed.
+	 *
+	 * @return {@code true} if the executor is installed, {@code false} otherwise.
+	 */
+	protected abstract boolean isExecutorInstalled();
+
+	/**
+	 * Provides the content of the hook that should be inserted into the pre-push script.
+	 *
+	 * @return A string representing the content to include in the pre-push script.
+	 */
+	protected abstract String preHookContent();
+
+	/**
+	 * Checks if Git is installed by validating the existence of `.git/config` in the repository root.
+	 *
+	 * @return {@code true} if Git is installed, {@code false} otherwise.
+	 */
+	private boolean isGitInstalled() {
+		return root.toPath().resolve(".git/config").toFile().exists();
+	}
+
+	/**
+	 * Verifies if the pre-push hook file already contains the custom Spotless hook content.
+	 *
+	 * @param gitHookFile The file representing the Git hook.
+	 * @return {@code true} if the hook is already installed, {@code false} otherwise.
+	 * @throws Exception if an error occurs when reading the file.
+	 */
+	private boolean isGitHookInstalled(File gitHookFile) throws Exception {
+		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
+		return hook.contains("##### SPOTLESS HOOK START #####");
+	}
+
+	/**
+	 * Writes the specified content into a file.
+	 *
+	 * @param file    The file to which the content should be written.
+	 * @param content The content to write into the file.
+	 * @throws IOException if an error occurs while writing to the file.
+	 */
+	private void writeFile(File file, String content) throws IOException {
+		try (final var writer = new FileWriter(file, UTF_8, true)) {
+			writer.write(content);
+		}
+	}
+
+	/**
+	 * Generates a pre-push template script that defines the commands to check and apply changes
+	 * using an executor and Spotless.
+	 *
+	 * @param executor      The tool to execute the check and apply commands.
+	 * @param commandCheck  The command to check for issues.
+	 * @param commandApply  The command to apply corrections.
+	 * @return A string template representing the Spotless Git pre-push hook content.
+	 */
+	protected String preHookTemplate(String executor, String commandCheck, String commandApply) {
+		var spotlessHook = "\n";
+		spotlessHook += "\n##### SPOTLESS HOOK START #####";
+		spotlessHook += "\nSPOTLESS_EXECUTOR=" + executor;
+		spotlessHook += "\nif ! $SPOTLESS_EXECUTOR " + commandCheck + " ; then";
+		spotlessHook += "\n    echo 1>&2 \"spotless found problems, running " + commandApply + "; commit the result and re-push\"";
+		spotlessHook += "\n    $SPOTLESS_EXECUTOR " + commandApply;
+		spotlessHook += "\n    exit 1";
+		spotlessHook += "\nfi";
+		spotlessHook += "\n##### SPOTLESS HOOK END #####";
+		spotlessHook += "\n\n";
+		return spotlessHook;
+	}
+
+	public interface GitPreHookLogger {
+		void info(String format, Object... arguments);
+		void error(String format, Object... arguments);
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
new file mode 100644
index 0000000000..8c4817c54c
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
@@ -0,0 +1,42 @@
+package com.diffplug.spotless;
+
+import java.io.File;
+
+/**
+ * Implementation of {@link GitPrePushHookInstaller} specifically for Gradle-based projects.
+ * This class installs a Git pre-push hook that uses Gradle's `gradlew` executable to check and apply Spotless formatting.
+ */
+public class GitPrePushHookInstallerGradle extends GitPrePushHookInstaller {
+
+	/**
+	 * The Gradle wrapper file (`gradlew`) located in the root directory of the project.
+	 */
+	private final File gradlew;
+
+	public GitPrePushHookInstallerGradle(GitPreHookLogger logger, File root) {
+		super(logger, root);
+		this.gradlew = root.toPath().resolve("gradlew").toFile();
+	}
+
+	/**
+	 * Checks if the Gradle wrapper (`gradlew`) is present in the root directory.
+	 * This ensures that the executor used for formatting (`spotlessCheck` and `spotlessApply`) is available.
+	 *
+	 * @return {@code true} if the Gradle wrapper is found, {@code false} otherwise.
+	 *         An error is logged if the wrapper is not found.
+	 */
+	@Override
+	protected boolean isExecutorInstalled() {
+		if (gradlew.exists()) {
+			return true;
+		}
+
+		logger.error("Failed to find gradlew in root directory");
+		return false;
+	}
+
+	@Override
+	protected String preHookContent() {
+		return preHookTemplate(gradlew.getAbsolutePath(), "spotlessCheck", "spotlessApply");
+	}
+}
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
new file mode 100644
index 0000000000..c54b2e4d02
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
@@ -0,0 +1,32 @@
+package com.diffplug.spotless;
+
+import java.io.File;
+
+/**
+ * Implementation of {@link GitPrePushHookInstaller} specifically for Maven-based projects.
+ * This class installs a Git pre-push hook that uses Maven to check and apply Spotless formatting.
+ */
+public class GitPrePushHookInstallerMaven extends GitPrePushHookInstaller {
+
+	public GitPrePushHookInstallerMaven(GitPreHookLogger logger, File root) {
+		super(logger, root);
+	}
+
+	/**
+	 * Confirms that Maven is installed and available for use.
+	 *
+	 * <p>This method assumes that if this code is running, then Maven is already properly installed and configured,
+	 * so it always returns {@code true}.
+	 *
+	 * @return {@code true}, indicating that Maven is available.
+	 */
+	@Override
+	protected boolean isExecutorInstalled() {
+		return true;
+	}
+
+	@Override
+	protected String preHookContent() {
+		return preHookTemplate("mvn", "spotless:check", "spotless:apply");
+	}
+}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index dd1e9c425f..b318ae421f 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
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
+- `spotlessInstallGitPrePushHook` task, which installs a Git `pre-push` hook to run `spotlessCheck` and `spotlessApply`.  
+  Uses shared implementation from `GitPrePushHookInstaller`.  
+  [#2553](https://github.com/diffplug/spotless/pull/2553)
 
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
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 e883953eaa..885d697688 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
@@ -38,14 +38,17 @@ public abstract class SpotlessExtension {
 	private final RegisterDependenciesTask registerDependenciesTask;
 
 	protected static final String TASK_GROUP = LifecycleBasePlugin.VERIFICATION_GROUP;
+	protected static final String BUILD_SETUP_TASK_GROUP = "build setup";
 	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.";
+	protected static final String INSTALL_GIT_PRE_PUSH_HOOK_DESCRIPTION = "Installs Spotless Git pre-push hook.";
 
 	static final String EXTENSION = "spotless";
 	static final String EXTENSION_PREDECLARE = "spotlessPredeclare";
 	static final String CHECK = "Check";
 	static final String APPLY = "Apply";
 	static final String DIAGNOSE = "Diagnose";
+	static final String INSTALL_GIT_PRE_PUSH_HOOK = "InstallGitPrePushHook";
 
 	protected SpotlessExtension(Project project) {
 		this.project = requireNonNull(project);
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 75168f690a..45d7ffade7 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
@@ -23,7 +23,7 @@
 import org.gradle.api.tasks.TaskProvider;
 
 public class SpotlessExtensionImpl extends SpotlessExtension {
-	final TaskProvider<?> rootCheckTask, rootApplyTask, rootDiagnoseTask;
+	final TaskProvider<?> rootCheckTask, rootApplyTask, rootDiagnoseTask, rootInstallPreHook;
 
 	public SpotlessExtensionImpl(Project project) {
 		super(project);
@@ -38,6 +38,10 @@ public SpotlessExtensionImpl(Project project) {
 		rootDiagnoseTask = project.getTasks().register(EXTENSION + DIAGNOSE, task -> {
 			task.setGroup(TASK_GROUP); // no description on purpose
 		});
+		rootInstallPreHook = project.getTasks().register(EXTENSION + INSTALL_GIT_PRE_PUSH_HOOK, SpotlessInstallPrePushHookTask.class, task -> {
+			task.setGroup(BUILD_SETUP_TASK_GROUP);
+			task.setDescription(INSTALL_GIT_PRE_PUSH_HOOK_DESCRIPTION);
+		});
 
 		project.afterEvaluate(unused -> {
 			if (enforceCheck) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
new file mode 100644
index 0000000000..df6b9bfc8e
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
@@ -0,0 +1,46 @@
+package com.diffplug.gradle.spotless;
+
+import org.gradle.api.DefaultTask;
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.work.DisableCachingByDefault;
+
+import com.diffplug.spotless.GitPrePushHookInstaller.GitPreHookLogger;
+import com.diffplug.spotless.GitPrePushHookInstallerGradle;
+
+/**
+ * A Gradle task responsible for installing a Git pre-push hook for the Spotless plugin.
+ * This hook ensures that Spotless formatting rules are automatically checked and applied
+ * before performing a Git push operation.
+ *
+ * <p>The task leverages {@link GitPrePushHookInstallerGradle} to implement the installation process.
+ */
+@DisableCachingByDefault(because = "not worth caching")
+public class SpotlessInstallPrePushHookTask extends DefaultTask {
+
+	/**
+	 * Executes the task to install the Git pre-push hook.
+	 *
+	 * <p>This method creates an instance of {@link GitPrePushHookInstallerGradle},
+	 * providing a logger to record informational and error messages during the installation process.
+	 * The installer then installs the hook in the root directory of the Gradle project.
+	 *
+	 * @throws Exception if an error occurs during the hook installation process.
+	 */
+	@TaskAction
+	public void performAction() throws Exception {
+		final var logger = new GitPreHookLogger() {
+			@Override
+			public void info(String format, Object... arguments) {
+				getLogger().lifecycle(String.format(format, arguments));
+			}
+
+			@Override
+			public void error(String format, Object... arguments) {
+				getLogger().error(String.format(format, arguments));
+			}
+		};
+
+		final var installer = new GitPrePushHookInstallerGradle(logger, getProject().getRootDir());
+		installer.install();
+	}
+}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
new file mode 100644
index 0000000000..1f74e14fc3
--- /dev/null
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
@@ -0,0 +1,70 @@
+package com.diffplug.gradle.spotless;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class SpotlessInstallPrePushHookTaskTest extends GradleIntegrationHarness {
+
+	@Test
+	public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws Exception {
+		// given
+		final var gradlew = setFile("gradlew").toContent("");
+		setFile(".git/config").toContent("");
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }"
+		);
+
+		// when
+		var output = gradleRunner()
+			.withArguments("spotlessInstallGitPrePushHook")
+			.build()
+			.getOutput();
+
+		// then
+		assertThat(output).contains("Installing git pre-push hook");
+		assertThat(output).contains("Git pre-push hook not found, creating it");
+		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
+
+		final var content = getTestResource("git_pre_hook/pre-push.created")
+			.replace("${executor}", gradlew.getAbsolutePath())
+			.replace("${checkCommand}", "spotlessCheck")
+			.replace("${applyCommand}", "spotlessApply");
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	@Test
+	public void should_append_to_existing_pre_hook_file_when_hook_file_exists() throws Exception {
+		// given
+		final var gradlew = setFile("gradlew").toContent("");
+		setFile(".git/config").toContent("");
+		setFile("build.gradle").toLines(
+			"plugins {",
+			"    id 'java'",
+			"    id 'com.diffplug.spotless'",
+			"}",
+			"repositories { mavenCentral() }"
+		);
+		setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing");
+
+		// when
+		final var output = gradleRunner()
+			.withArguments("spotlessInstallGitPrePushHook")
+			.build()
+			.getOutput();
+
+		// then
+		assertThat(output).contains("Installing git pre-push hook");
+		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
+
+		final var content = getTestResource("git_pre_hook/pre-push.existing-added")
+			.replace("${executor}", gradlew.getAbsolutePath())
+			.replace("${checkCommand}", "spotlessCheck")
+			.replace("${applyCommand}", "spotlessApply");
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+}
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6829753b2e..f44ad846d4 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
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
+- `spotless:install-git-pre-push-hook` goal, which installs a Git `pre-push` hook to run `spotless:check` and `spotless:apply`.  
+  Uses shared implementation from `GitPrePushHookInstaller`.  
+  [#2553](https://github.com/diffplug/spotless/pull/2553)
 
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
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 d21a1b8113..5a21a7258a 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,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 
 	static final String GOAL_CHECK = "check";
 	static final String GOAL_APPLY = "apply";
+	static final String GOAL_PRE_PUSH_HOOK = "install-git-pre-push-hook";
 
 	@Component
 	private RepositorySystem repositorySystem;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
new file mode 100644
index 0000000000..356a52e913
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
@@ -0,0 +1,63 @@
+package com.diffplug.spotless.maven;
+
+import java.io.File;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
+import com.diffplug.spotless.GitPrePushHookInstaller.GitPreHookLogger;
+import com.diffplug.spotless.GitPrePushHookInstallerMaven;
+
+/**
+ * A Maven Mojo responsible for installing a Git pre-push hook for the Spotless plugin.
+ * This hook ensures that Spotless formatting rules are automatically checked and applied
+ * before performing a Git push operation.
+ *
+ * <p>The class leverages {@link GitPrePushHookInstallerMaven} to perform the installation process
+ * and uses a Maven logger to log installation events and errors to the console.
+ */
+@Mojo(name = AbstractSpotlessMojo.GOAL_PRE_PUSH_HOOK, threadSafe = true)
+public class SpotlessInstallPrePushHookMojo extends AbstractMojo {
+
+	/**
+	 * The base directory of the Maven project where the Git pre-push hook will be installed.
+	 * This parameter is automatically set to the root directory of the current project.
+	 */
+	@Parameter(defaultValue = "${project.basedir}", readonly = true, required = true)
+	private File baseDir;
+
+	/**
+	 * Executes the Mojo, installing the Git pre-push hook for the Spotless plugin.
+	 *
+	 * <p>This method creates an instance of {@link GitPrePushHookInstallerMaven},
+	 * providing a logger for logging the process of hook installation and any potential errors.
+	 * The installation process runs in the root directory of the current Maven project.
+	 *
+	 * @throws MojoExecutionException if an error occurs during the installation process.
+	 * @throws MojoFailureException   if the hook fails to install for any reason.
+	 */
+	@Override
+	public void execute() throws MojoExecutionException, MojoFailureException {
+		final var logger = new GitPreHookLogger() {
+			@Override
+			public void info(String format, Object... arguments) {
+				getLog().info(String.format(format, arguments));
+			}
+
+			@Override
+			public void error(String format, Object... arguments) {
+				getLog().error(String.format(format, arguments));
+			}
+		};
+
+		try {
+			final var installer = new GitPrePushHookInstallerMaven(logger, baseDir);
+			installer.install();
+		} catch (Exception e) {
+			throw new MojoExecutionException("Unable to install pre-push hook", e);
+		}
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
new file mode 100644
index 0000000000..ad6faf823b
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
@@ -0,0 +1,69 @@
+package com.diffplug.spotless.maven;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SpotlessInstallPrePushHookMojoTest extends MavenIntegrationHarness {
+
+	@Test
+	public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws Exception {
+		// given
+		setFile(".git/config").toContent("");
+		setFile("license.txt").toResource("license/TestLicense");
+		writePomWithJavaLicenseHeaderStep();
+
+		// when
+		final var output = mavenRunner()
+			.withArguments("spotless:install-git-pre-push-hook")
+			.runNoError()
+			.stdOutUtf8();
+
+		// then
+		assertThat(output).contains("Installing git pre-push hook");
+		assertThat(output).contains("Git pre-push hook not found, creating it");
+		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
+
+
+		final var content = getTestResource("git_pre_hook/pre-push.created")
+			.replace("${executor}", "mvn")
+			.replace("${checkCommand}", "spotless:check")
+			.replace("${applyCommand}", "spotless:apply");
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	@Test
+	public void should_append_to_existing_pre_hook_file_when_hook_file_exists() throws Exception {
+		// given
+		setFile(".git/config").toContent("");
+		setFile("license.txt").toResource("license/TestLicense");
+		setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing");
+
+		writePomWithJavaLicenseHeaderStep();
+
+		// when
+		final var output = mavenRunner()
+			.withArguments("spotless:install-git-pre-push-hook")
+			.runNoError()
+			.stdOutUtf8();
+
+		// then
+		assertThat(output).contains("Installing git pre-push hook");
+		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
+
+		final var content = getTestResource("git_pre_hook/pre-push.existing-added")
+			.replace("${executor}", "mvn")
+			.replace("${checkCommand}", "spotless:check")
+			.replace("${applyCommand}", "spotless:apply");
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	private void writePomWithJavaLicenseHeaderStep() throws IOException {
+		writePomWithJavaSteps(
+			"<licenseHeader>",
+			"  <file>${basedir}/license.txt</file>",
+			"</licenseHeader>");
+	}
+}
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.created b/testlib/src/main/resources/git_pre_hook/pre-push.created
new file mode 100644
index 0000000000..376598c605
--- /dev/null
+++ b/testlib/src/main/resources/git_pre_hook/pre-push.created
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+
+##### SPOTLESS HOOK START #####
+SPOTLESS_EXECUTOR=${executor}
+if ! $SPOTLESS_EXECUTOR ${checkCommand} ; then
+    echo 1>&2 "spotless found problems, running ${applyCommand}; commit the result and re-push"
+    $SPOTLESS_EXECUTOR ${applyCommand}
+    exit 1
+fi
+##### SPOTLESS HOOK END #####
+
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.existing b/testlib/src/main/resources/git_pre_hook/pre-push.existing
new file mode 100644
index 0000000000..a46210c6c1
--- /dev/null
+++ b/testlib/src/main/resources/git_pre_hook/pre-push.existing
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+        if test "$local_oid" = "$zero"
+        then
+                # Handle delete
+                :
+        else
+                if test "$remote_oid" = "$zero"
+                then
+                        # New branch, examine all commits
+                        range="$local_oid"
+                else
+                        # Update to existing branch, examine new commits
+                        range="$remote_oid..$local_oid"
+                fi
+
+                # Check for WIP commit
+                commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+                if test -n "$commit"
+                then
+                        echo >&2 "Found WIP commit in $local_ref, not pushing"
+                        exit 1
+                fi
+        fi
+done
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.existing-added b/testlib/src/main/resources/git_pre_hook/pre-push.existing-added
new file mode 100644
index 0000000000..fd107efaec
--- /dev/null
+++ b/testlib/src/main/resources/git_pre_hook/pre-push.existing-added
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+        if test "$local_oid" = "$zero"
+        then
+                # Handle delete
+                :
+        else
+                if test "$remote_oid" = "$zero"
+                then
+                        # New branch, examine all commits
+                        range="$local_oid"
+                else
+                        # Update to existing branch, examine new commits
+                        range="$remote_oid..$local_oid"
+                fi
+
+                # Check for WIP commit
+                commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+                if test -n "$commit"
+                then
+                        echo >&2 "Found WIP commit in $local_ref, not pushing"
+                        exit 1
+                fi
+        fi
+done
+
+
+##### SPOTLESS HOOK START #####
+SPOTLESS_EXECUTOR=${executor}
+if ! $SPOTLESS_EXECUTOR ${checkCommand} ; then
+    echo 1>&2 "spotless found problems, running ${applyCommand}; commit the result and re-push"
+    $SPOTLESS_EXECUTOR ${applyCommand}
+    exit 1
+fi
+##### SPOTLESS HOOK END #####
+
diff --git a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
new file mode 100644
index 0000000000..78ed927ed0
--- /dev/null
+++ b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
@@ -0,0 +1,148 @@
+package com.diffplug.spotless;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.GitPrePushHookInstaller.GitPreHookLogger;
+
+class GitPrePushHookInstallerTest extends ResourceHarness {
+	private final List<String> logs = new ArrayList<>();
+	private final GitPreHookLogger logger = new GitPreHookLogger() {
+		@Override
+		public void info(String format, Object... arguments) {
+			logs.add(String.format(format, arguments));
+		}
+
+		@Override
+		public void error(String format, Object... arguments) {
+			logs.add(String.format(format, arguments));
+		}
+	};
+
+	@Test
+	public void should_not_create_pre_hook_file_when_git_is_not_installed() throws Exception {
+	    // given
+		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
+
+	    // when
+		gradle.install();
+
+	    // then
+		assertThat(logs).hasSize(2);
+		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
+		assertThat(logs).element(1).isEqualTo("Git not found in root directory");
+		assertThat(newFile(".git/hooks/pre-push")).doesNotExist();
+	}
+
+	@Test
+	public void should_not_create_pre_hook_file_when_gradlew_is_not_installed() throws Exception {
+		// given
+		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
+		setFile(".git/config").toContent("");
+
+		// when
+		gradle.install();
+
+		// then
+		assertThat(logs).hasSize(2);
+		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
+		assertThat(logs).element(1).isEqualTo("Failed to find gradlew in root directory");
+		assertThat(newFile(".git/hooks/pre-push")).doesNotExist();
+	}
+
+	@Test
+	public void should_not_create_pre_hook_file_when_hook_already_installed() throws Exception {
+		// given
+		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
+		final var hookFile = setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing-added");
+
+		setFile("gradlew").toContent("");
+		setFile(".git/config").toContent("");
+
+		// when
+		gradle.install();
+
+		// then
+		assertThat(logs).hasSize(2);
+		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
+		assertThat(logs).element(1).isEqualTo("Skipping, git pre-push hook already installed " + hookFile.getAbsolutePath());
+		assertThat(hookFile).content().isEqualTo(getTestResource("git_pre_hook/pre-push.existing-added"));
+	}
+
+	@Test
+	public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws Exception {
+		// given
+		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
+		final var gradlew = setFile("gradlew").toContent("");
+		setFile(".git/config").toContent("");
+
+		// when
+		gradle.install();
+
+		// then
+		assertThat(logs).hasSize(3);
+		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
+		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
+		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
+
+		final var content = gradleHookContent("git_pre_hook/pre-push.created");
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	@Test
+	public void should_append_to_existing_pre_hook_file_when_hook_file_exists() throws Exception {
+		// given
+		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
+		final var gradlew = setFile("gradlew").toContent("");
+		setFile(".git/config").toContent("");
+		setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing");
+
+		// when
+		gradle.install();
+
+		// then
+		assertThat(logs).hasSize(2);
+		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
+		assertThat(logs).element(1).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
+
+		final var content = gradleHookContent("git_pre_hook/pre-push.existing-added");
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	@Test
+	public void should_create_pre_hook_file_for_maven_when_hook_file_does_not_exists() throws Exception {
+		// given
+		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+		setFile(".git/config").toContent("");
+
+		// when
+		gradle.install();
+
+		// then
+		assertThat(logs).hasSize(3);
+		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
+		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
+		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
+
+		final var content = mavenHookContent("git_pre_hook/pre-push.created");
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	private String gradleHookContent(String resourcePath) {
+		return getTestResource(resourcePath)
+			.replace("${executor}", setFile("gradlew").toContent("").getAbsolutePath())
+			.replace("${checkCommand}", "spotlessCheck")
+			.replace("${applyCommand}", "spotlessApply");
+	}
+
+	private String mavenHookContent(String resourcePath) {
+		return getTestResource(resourcePath)
+			.replace("${executor}", "mvn")
+			.replace("${checkCommand}", "spotless:check")
+			.replace("${applyCommand}", "spotless:apply");
+	}
+}

From 6528b0bbba29d130fcdcd1432eeb6b1f928b6493 Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Fri, 11 Jul 2025 23:56:21 -0700
Subject: [PATCH 189/210] spotlessApply

---
 .../spotless/GitPrePushHookInstaller.java     | 22 ++++++-
 .../GitPrePushHookInstallerGradle.java        | 15 +++++
 .../GitPrePushHookInstallerMaven.java         | 15 +++++
 .../gradle/spotless/SpotlessExtension.java    |  2 +-
 .../spotless/SpotlessExtensionImpl.java       |  2 +-
 .../SpotlessInstallPrePushHookTask.java       | 15 +++++
 .../SpotlessInstallPrePushHookTaskTest.java   | 62 ++++++++++++-------
 .../spotless/maven/AbstractSpotlessMojo.java  |  2 +-
 .../maven/SpotlessInstallPrePushHookMojo.java | 15 +++++
 .../SpotlessInstallPrePushHookMojoTest.java   | 50 +++++++++------
 .../spotless/GitPrePushHookInstallerTest.java | 33 +++++++---
 11 files changed, 178 insertions(+), 55 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
index a317689b35..f8f6a19a88 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
@@ -1,3 +1,18 @@
+/*
+ * 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 static java.nio.charset.StandardCharsets.UTF_8;
@@ -66,7 +81,11 @@ public void install() throws Exception {
 		final var gitHookFile = root.toPath().resolve(".git/hooks/pre-push").toFile();
 		if (!gitHookFile.exists()) {
 			logger.info("Git pre-push hook not found, creating it");
-			gitHookFile.getParentFile().mkdirs();
+			if (!gitHookFile.getParentFile().exists() && !gitHookFile.getParentFile().mkdirs()) {
+				logger.error("Failed to create pre-push hook directory");
+				return;
+			}
+
 			if (!gitHookFile.createNewFile()) {
 				logger.error("Failed to create pre-push hook file");
 				return;
@@ -164,6 +183,7 @@ protected String preHookTemplate(String executor, String commandCheck, String co
 
 	public interface GitPreHookLogger {
 		void info(String format, Object... arguments);
+
 		void error(String format, Object... arguments);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
index 8c4817c54c..26ba4b5442 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
@@ -1,3 +1,18 @@
+/*
+ * 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.File;
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
index c54b2e4d02..1148c07267 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
@@ -1,3 +1,18 @@
+/*
+ * 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.File;
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 885d697688..92079d67c4 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-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/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtensionImpl.java
index 45d7ffade7..53b7b011a1 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-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/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
index df6b9bfc8e..2b8d19264b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
@@ -1,3 +1,18 @@
+/*
+ * 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.gradle.spotless;
 
 import org.gradle.api.DefaultTask;
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
index 1f74e14fc3..9146a773a2 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.gradle.spotless;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -11,19 +26,19 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 		// given
 		final var gradlew = setFile("gradlew").toContent("");
 		setFile(".git/config").toContent("");
+		newFile(".git/hooks").mkdirs();
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }"
-		);
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }");
 
 		// when
 		var output = gradleRunner()
-			.withArguments("spotlessInstallGitPrePushHook")
-			.build()
-			.getOutput();
+				.withArguments("spotlessInstallGitPrePushHook")
+				.build()
+				.getOutput();
 
 		// then
 		assertThat(output).contains("Installing git pre-push hook");
@@ -31,9 +46,9 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
 		final var content = getTestResource("git_pre_hook/pre-push.created")
-			.replace("${executor}", gradlew.getAbsolutePath())
-			.replace("${checkCommand}", "spotlessCheck")
-			.replace("${applyCommand}", "spotlessApply");
+				.replace("${executor}", gradlew.getAbsolutePath())
+				.replace("${checkCommand}", "spotlessCheck")
+				.replace("${applyCommand}", "spotlessApply");
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
@@ -43,28 +58,27 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		final var gradlew = setFile("gradlew").toContent("");
 		setFile(".git/config").toContent("");
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'java'",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }"
-		);
+				"plugins {",
+				"    id 'java'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }");
 		setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing");
 
 		// when
 		final var output = gradleRunner()
-			.withArguments("spotlessInstallGitPrePushHook")
-			.build()
-			.getOutput();
+				.withArguments("spotlessInstallGitPrePushHook")
+				.build()
+				.getOutput();
 
 		// then
 		assertThat(output).contains("Installing git pre-push hook");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
 		final var content = getTestResource("git_pre_hook/pre-push.existing-added")
-			.replace("${executor}", gradlew.getAbsolutePath())
-			.replace("${checkCommand}", "spotlessCheck")
-			.replace("${applyCommand}", "spotlessApply");
+				.replace("${executor}", gradlew.getAbsolutePath())
+				.replace("${checkCommand}", "spotlessCheck")
+				.replace("${applyCommand}", "spotlessApply");
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 }
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 5a21a7258a..e5a8004f97 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-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/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
index 356a52e913..691ddd4969 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
@@ -1,3 +1,18 @@
+/*
+ * 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.maven;
 
 import java.io.File;
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
index ad6faf823b..b9d5d6a343 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
@@ -1,11 +1,26 @@
+/*
+ * 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.maven;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 class SpotlessInstallPrePushHookMojoTest extends MavenIntegrationHarness {
 
 	@Test
@@ -17,20 +32,19 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 
 		// when
 		final var output = mavenRunner()
-			.withArguments("spotless:install-git-pre-push-hook")
-			.runNoError()
-			.stdOutUtf8();
+				.withArguments("spotless:install-git-pre-push-hook")
+				.runNoError()
+				.stdOutUtf8();
 
 		// then
 		assertThat(output).contains("Installing git pre-push hook");
 		assertThat(output).contains("Git pre-push hook not found, creating it");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-
 		final var content = getTestResource("git_pre_hook/pre-push.created")
-			.replace("${executor}", "mvn")
-			.replace("${checkCommand}", "spotless:check")
-			.replace("${applyCommand}", "spotless:apply");
+				.replace("${executor}", "mvn")
+				.replace("${checkCommand}", "spotless:check")
+				.replace("${applyCommand}", "spotless:apply");
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
@@ -45,25 +59,25 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 
 		// when
 		final var output = mavenRunner()
-			.withArguments("spotless:install-git-pre-push-hook")
-			.runNoError()
-			.stdOutUtf8();
+				.withArguments("spotless:install-git-pre-push-hook")
+				.runNoError()
+				.stdOutUtf8();
 
 		// then
 		assertThat(output).contains("Installing git pre-push hook");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
 		final var content = getTestResource("git_pre_hook/pre-push.existing-added")
-			.replace("${executor}", "mvn")
-			.replace("${checkCommand}", "spotless:check")
-			.replace("${applyCommand}", "spotless:apply");
+				.replace("${executor}", "mvn")
+				.replace("${checkCommand}", "spotless:check")
+				.replace("${applyCommand}", "spotless:apply");
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
 	private void writePomWithJavaLicenseHeaderStep() throws IOException {
 		writePomWithJavaSteps(
-			"<licenseHeader>",
-			"  <file>${basedir}/license.txt</file>",
-			"</licenseHeader>");
+				"<licenseHeader>",
+				"  <file>${basedir}/license.txt</file>",
+				"</licenseHeader>");
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
index 78ed927ed0..4fd9eed749 100644
--- a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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 static org.assertj.core.api.Assertions.assertThat;
@@ -25,13 +40,13 @@ public void error(String format, Object... arguments) {
 
 	@Test
 	public void should_not_create_pre_hook_file_when_git_is_not_installed() throws Exception {
-	    // given
+		// given
 		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
 
-	    // when
+		// when
 		gradle.install();
 
-	    // then
+		// then
 		assertThat(logs).hasSize(2);
 		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
 		assertThat(logs).element(1).isEqualTo("Git not found in root directory");
@@ -134,15 +149,15 @@ public void should_create_pre_hook_file_for_maven_when_hook_file_does_not_exists
 
 	private String gradleHookContent(String resourcePath) {
 		return getTestResource(resourcePath)
-			.replace("${executor}", setFile("gradlew").toContent("").getAbsolutePath())
-			.replace("${checkCommand}", "spotlessCheck")
-			.replace("${applyCommand}", "spotlessApply");
+				.replace("${executor}", setFile("gradlew").toContent("").getAbsolutePath())
+				.replace("${checkCommand}", "spotlessCheck")
+				.replace("${applyCommand}", "spotlessApply");
 	}
 
 	private String mavenHookContent(String resourcePath) {
 		return getTestResource(resourcePath)
-			.replace("${executor}", "mvn")
-			.replace("${checkCommand}", "spotless:check")
-			.replace("${applyCommand}", "spotless:apply");
+				.replace("${executor}", "mvn")
+				.replace("${checkCommand}", "spotless:check")
+				.replace("${applyCommand}", "spotless:apply");
 	}
 }

From b9f488017e4902cf98f37d074f9380fac54df807 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@localhost>
Date: Thu, 17 Jul 2025 09:53:18 -0700
Subject: [PATCH 190/210] Placeholders for docs.

---
 plugin-gradle/README.md | 5 +++++
 plugin-maven/README.md  | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 1fa7519a8c..6e6e648ed6 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)
+  - [Git hook](#git-hook)
   - [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), [IntelliJ IDEA](#intellij-idea))
@@ -141,6 +142,10 @@ 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).
 
+### Git hook
+
+TODO
+
 ### 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:
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f633ca5635..8cd01731ba 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -37,6 +37,7 @@ user@machine repo % mvn spotless:check
 
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
+  - [Git hook](#git-hook)
   - [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), [cleanthat](#cleanthat), [IntelliJ IDEA](#intellij-idea))
@@ -145,7 +146,10 @@ Spotless consists of a list of formats (in the example above, `misc` and `java`)
 
 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>
+
+### Git hook
+
+TODO
 
 ### Binding to maven phase
 
@@ -176,6 +180,8 @@ any other maven phase (i.e. compile) then it can be configured as below;
 </executions>
 ```
 
+<a name="applying-to-java-source"></a>
+
 ## Java
 
 [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java).

From a790659b8936a782ca5eae3fe2b7ea721e9f4764 Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Thu, 17 Jul 2025 21:45:19 -0700
Subject: [PATCH 191/210] maven wrapper support

---
 .../spotless/GitPrePushHookInstaller.java     | 29 ++++------
 .../GitPrePushHookInstallerGradle.java        | 24 ++++----
 .../GitPrePushHookInstallerMaven.java         | 24 ++++----
 .../SpotlessInstallPrePushHookTask.java       |  5 ++
 .../SpotlessInstallPrePushHookTaskTest.java   |  6 +-
 .../maven/SpotlessInstallPrePushHookMojo.java |  5 ++
 .../spotless/GitPrePushHookInstallerTest.java | 56 ++++++++++++++-----
 7 files changed, 89 insertions(+), 60 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
index f8f6a19a88..9c317d94ab 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -30,6 +31,9 @@
  */
 public abstract class GitPrePushHookInstaller {
 
+	private static final String HOOK_HEADLINE = "##### SPOTLESS HOOK START #####";
+	private static final String HOOK_FOOTER = "##### SPOTLESS HOOK END #####";
+
 	/**
 	 * Logger for recording informational and error messages during the installation process.
 	 */
@@ -47,8 +51,8 @@ public abstract class GitPrePushHookInstaller {
 	 * @param root   The root directory of the Git repository.
 	 */
 	public GitPrePushHookInstaller(GitPreHookLogger logger, File root) {
-		this.logger = logger;
-		this.root = root;
+		this.logger = requireNonNull(logger, "logger can not be null");
+		this.root = requireNonNull(root, "root file can not be null");
 	}
 
 	/**
@@ -73,10 +77,6 @@ public void install() throws Exception {
 			return;
 		}
 
-		if (!isExecutorInstalled()) {
-			return;
-		}
-
 		var hookContent = "";
 		final var gitHookFile = root.toPath().resolve(".git/hooks/pre-push").toFile();
 		if (!gitHookFile.exists()) {
@@ -100,7 +100,7 @@ public void install() throws Exception {
 		}
 
 		if (isGitHookInstalled(gitHookFile)) {
-			logger.info("Skipping, git pre-push hook already installed %s", gitHookFile.getAbsolutePath());
+			logger.warn("Skipping, git pre-push hook already installed %s", gitHookFile.getAbsolutePath());
 			return;
 		}
 
@@ -110,13 +110,6 @@ public void install() throws Exception {
 		logger.info("Git pre-push hook installed successfully to the file %s", gitHookFile.getAbsolutePath());
 	}
 
-	/**
-	 * Checks if the required executor for performing the desired pre-push actions is installed.
-	 *
-	 * @return {@code true} if the executor is installed, {@code false} otherwise.
-	 */
-	protected abstract boolean isExecutorInstalled();
-
 	/**
 	 * Provides the content of the hook that should be inserted into the pre-push script.
 	 *
@@ -142,7 +135,7 @@ private boolean isGitInstalled() {
 	 */
 	private boolean isGitHookInstalled(File gitHookFile) throws Exception {
 		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
-		return hook.contains("##### SPOTLESS HOOK START #####");
+		return hook.contains(HOOK_HEADLINE);
 	}
 
 	/**
@@ -169,21 +162,21 @@ private void writeFile(File file, String content) throws IOException {
 	 */
 	protected String preHookTemplate(String executor, String commandCheck, String commandApply) {
 		var spotlessHook = "\n";
-		spotlessHook += "\n##### SPOTLESS HOOK START #####";
+		spotlessHook += "\n" + HOOK_HEADLINE;
 		spotlessHook += "\nSPOTLESS_EXECUTOR=" + executor;
 		spotlessHook += "\nif ! $SPOTLESS_EXECUTOR " + commandCheck + " ; then";
 		spotlessHook += "\n    echo 1>&2 \"spotless found problems, running " + commandApply + "; commit the result and re-push\"";
 		spotlessHook += "\n    $SPOTLESS_EXECUTOR " + commandApply;
 		spotlessHook += "\n    exit 1";
 		spotlessHook += "\nfi";
-		spotlessHook += "\n##### SPOTLESS HOOK END #####";
+		spotlessHook += "\n" + HOOK_FOOTER;
 		spotlessHook += "\n\n";
 		return spotlessHook;
 	}
 
 	public interface GitPreHookLogger {
 		void info(String format, Object... arguments);
-
+		void warn(String format, Object... arguments);
 		void error(String format, Object... arguments);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
index 26ba4b5442..8ae6e6cb94 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
@@ -33,25 +33,21 @@ public GitPrePushHookInstallerGradle(GitPreHookLogger logger, File root) {
 		this.gradlew = root.toPath().resolve("gradlew").toFile();
 	}
 
+
 	/**
-	 * Checks if the Gradle wrapper (`gradlew`) is present in the root directory.
-	 * This ensures that the executor used for formatting (`spotlessCheck` and `spotlessApply`) is available.
-	 *
-	 * @return {@code true} if the Gradle wrapper is found, {@code false} otherwise.
-	 *         An error is logged if the wrapper is not found.
+	 * {@inheritDoc}
 	 */
 	@Override
-	protected boolean isExecutorInstalled() {
+	protected String preHookContent() {
+		return preHookTemplate(executor(), "spotlessCheck", "spotlessApply");
+	}
+
+	private String executor() {
 		if (gradlew.exists()) {
-			return true;
+			return gradlew.getAbsolutePath();
 		}
 
-		logger.error("Failed to find gradlew in root directory");
-		return false;
-	}
-
-	@Override
-	protected String preHookContent() {
-		return preHookTemplate(gradlew.getAbsolutePath(), "spotlessCheck", "spotlessApply");
+		logger.info("Gradle wrapper is not installed, using global gradle");
+		return "gradle";
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
index 1148c07267..7f84d85429 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
@@ -23,25 +23,27 @@
  */
 public class GitPrePushHookInstallerMaven extends GitPrePushHookInstaller {
 
+	private final File mvnw;
+
 	public GitPrePushHookInstallerMaven(GitPreHookLogger logger, File root) {
 		super(logger, root);
+		this.mvnw = root.toPath().resolve("mvnw").toFile();
 	}
 
 	/**
-	 * Confirms that Maven is installed and available for use.
-	 *
-	 * <p>This method assumes that if this code is running, then Maven is already properly installed and configured,
-	 * so it always returns {@code true}.
-	 *
-	 * @return {@code true}, indicating that Maven is available.
+	 * {@inheritDoc}
 	 */
 	@Override
-	protected boolean isExecutorInstalled() {
-		return true;
+	protected String preHookContent() {
+		return preHookTemplate(executor(), "spotless:check", "spotless:apply");
 	}
 
-	@Override
-	protected String preHookContent() {
-		return preHookTemplate("mvn", "spotless:check", "spotless:apply");
+	private String executor() {
+		if (mvnw.exists()) {
+			return mvnw.getAbsolutePath();
+		}
+
+		logger.info("Maven wrapper is not installed, using global maven");
+		return "mvn";
 	}
 }
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
index 2b8d19264b..3e59e94b0a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTask.java
@@ -49,6 +49,11 @@ public void info(String format, Object... arguments) {
 				getLogger().lifecycle(String.format(format, arguments));
 			}
 
+			@Override
+			public void warn(String format, Object... arguments) {
+				getLogger().warn(String.format(format, arguments));
+			}
+
 			@Override
 			public void error(String format, Object... arguments) {
 				getLogger().error(String.format(format, arguments));
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
index 9146a773a2..140bb8a755 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
@@ -24,7 +24,6 @@ class SpotlessInstallPrePushHookTaskTest extends GradleIntegrationHarness {
 	@Test
 	public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws Exception {
 		// given
-		final var gradlew = setFile("gradlew").toContent("");
 		setFile(".git/config").toContent("");
 		newFile(".git/hooks").mkdirs();
 		setFile("build.gradle").toLines(
@@ -46,7 +45,7 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
 		final var content = getTestResource("git_pre_hook/pre-push.created")
-				.replace("${executor}", gradlew.getAbsolutePath())
+				.replace("${executor}", "gradle")
 				.replace("${checkCommand}", "spotlessCheck")
 				.replace("${applyCommand}", "spotlessApply");
 		assertFile(".git/hooks/pre-push").hasContent(content);
@@ -55,7 +54,6 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 	@Test
 	public void should_append_to_existing_pre_hook_file_when_hook_file_exists() throws Exception {
 		// given
-		final var gradlew = setFile("gradlew").toContent("");
 		setFile(".git/config").toContent("");
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -76,7 +74,7 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
 		final var content = getTestResource("git_pre_hook/pre-push.existing-added")
-				.replace("${executor}", gradlew.getAbsolutePath())
+				.replace("${executor}", "gradle")
 				.replace("${checkCommand}", "spotlessCheck")
 				.replace("${applyCommand}", "spotlessApply");
 		assertFile(".git/hooks/pre-push").hasContent(content);
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
index 691ddd4969..984724a688 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojo.java
@@ -62,6 +62,11 @@ public void info(String format, Object... arguments) {
 				getLog().info(String.format(format, arguments));
 			}
 
+			@Override
+			public void warn(String format, Object... arguments) {
+				getLog().warn(String.format(format, arguments));
+			}
+
 			@Override
 			public void error(String format, Object... arguments) {
 				getLog().error(String.format(format, arguments));
diff --git a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
index 4fd9eed749..b6fbcd26e8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
@@ -32,6 +32,11 @@ public void info(String format, Object... arguments) {
 			logs.add(String.format(format, arguments));
 		}
 
+		@Override
+		public void warn(String format, Object... arguments) {
+			logs.add(String.format(format, arguments));
+		}
+
 		@Override
 		public void error(String format, Object... arguments) {
 			logs.add(String.format(format, arguments));
@@ -54,7 +59,7 @@ public void should_not_create_pre_hook_file_when_git_is_not_installed() throws E
 	}
 
 	@Test
-	public void should_not_create_pre_hook_file_when_gradlew_is_not_installed() throws Exception {
+	public void should_use_global_gradle_when_gradlew_is_not_installed() throws Exception {
 		// given
 		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
 		setFile(".git/config").toContent("");
@@ -63,10 +68,14 @@ public void should_not_create_pre_hook_file_when_gradlew_is_not_installed() thro
 		gradle.install();
 
 		// then
-		assertThat(logs).hasSize(2);
+		assertThat(logs).hasSize(4);
 		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
-		assertThat(logs).element(1).isEqualTo("Failed to find gradlew in root directory");
-		assertThat(newFile(".git/hooks/pre-push")).doesNotExist();
+		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
+		assertThat(logs).element(2).isEqualTo("Gradle wrapper is not installed, using global gradle");
+		assertThat(logs).element(3).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
+
+		final var content = gradleHookContent("git_pre_hook/pre-push.created", false);
+		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
 	@Test
@@ -92,7 +101,7 @@ public void should_not_create_pre_hook_file_when_hook_already_installed() throws
 	public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws Exception {
 		// given
 		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
-		final var gradlew = setFile("gradlew").toContent("");
+		setFile("gradlew").toContent("");
 		setFile(".git/config").toContent("");
 
 		// when
@@ -104,7 +113,7 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
 		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = gradleHookContent("git_pre_hook/pre-push.created");
+		final var content = gradleHookContent("git_pre_hook/pre-push.created", true);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
@@ -112,7 +121,7 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 	public void should_append_to_existing_pre_hook_file_when_hook_file_exists() throws Exception {
 		// given
 		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
-		final var gradlew = setFile("gradlew").toContent("");
+		setFile("gradlew").toContent("");
 		setFile(".git/config").toContent("");
 		setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing");
 
@@ -124,7 +133,7 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = gradleHookContent("git_pre_hook/pre-push.existing-added");
+		final var content = gradleHookContent("git_pre_hook/pre-push.existing-added", true);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
@@ -132,6 +141,7 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 	public void should_create_pre_hook_file_for_maven_when_hook_file_does_not_exists() throws Exception {
 		// given
 		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+		setFile("mvnw").toContent("");
 		setFile(".git/config").toContent("");
 
 		// when
@@ -143,20 +153,40 @@ public void should_create_pre_hook_file_for_maven_when_hook_file_does_not_exists
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
 		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = mavenHookContent("git_pre_hook/pre-push.created");
+		final var content = mavenHookContent("git_pre_hook/pre-push.created", true);
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	@Test
+	public void should_use_global_maven_when_maven_wrapper_is_not_installed() throws Exception {
+		// given
+		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+		setFile(".git/config").toContent("");
+
+		// when
+		gradle.install();
+
+		// then
+		assertThat(logs).hasSize(4);
+		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
+		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
+		assertThat(logs).element(2).isEqualTo("Maven wrapper is not installed, using global maven");
+		assertThat(logs).element(3).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
+
+		final var content = mavenHookContent("git_pre_hook/pre-push.created", false);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
-	private String gradleHookContent(String resourcePath) {
+	private String gradleHookContent(String resourcePath, boolean isWrapper) {
 		return getTestResource(resourcePath)
-				.replace("${executor}", setFile("gradlew").toContent("").getAbsolutePath())
+				.replace("${executor}", isWrapper ? newFile("gradlew").getAbsolutePath() : "gradle")
 				.replace("${checkCommand}", "spotlessCheck")
 				.replace("${applyCommand}", "spotlessApply");
 	}
 
-	private String mavenHookContent(String resourcePath) {
+	private String mavenHookContent(String resourcePath, boolean isWrapper) {
 		return getTestResource(resourcePath)
-				.replace("${executor}", "mvn")
+				.replace("${executor}", isWrapper ? newFile("mvnw").getAbsolutePath() : "mvn")
 				.replace("${checkCommand}", "spotless:check")
 				.replace("${applyCommand}", "spotless:apply");
 	}

From 525e70eb8751e432e527cc23434f0c009fa4ae90 Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Thu, 17 Jul 2025 22:44:46 -0700
Subject: [PATCH 192/210] reinstall support

---
 .../spotless/GitPrePushHookInstaller.java     | 86 +++++++++++++------
 .../GitPrePushHookInstallerGradle.java        |  1 -
 plugin-gradle/README.md                       | 31 ++++++-
 .../SpotlessInstallPrePushHookTaskTest.java   |  4 +-
 plugin-maven/README.md                        | 31 ++++++-
 .../SpotlessInstallPrePushHookMojoTest.java   |  8 +-
 ...{pre-push.created => pre-push.created-tpl} |  1 -
 ...ting-added => pre-push.existing-added-tpl} |  1 -
 .../git_pre_hook/pre-push.reinstalled-tpl     | 64 ++++++++++++++
 .../spotless/GitPrePushHookInstallerTest.java | 36 +++++---
 10 files changed, 206 insertions(+), 57 deletions(-)
 rename testlib/src/main/resources/git_pre_hook/{pre-push.created => pre-push.created-tpl} (99%)
 rename testlib/src/main/resources/git_pre_hook/{pre-push.existing-added => pre-push.existing-added-tpl} (99%)
 create mode 100644 testlib/src/main/resources/git_pre_hook/pre-push.reinstalled-tpl

diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
index 9c317d94ab..b5070a003b 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
@@ -100,16 +100,44 @@ public void install() throws Exception {
 		}
 
 		if (isGitHookInstalled(gitHookFile)) {
-			logger.warn("Skipping, git pre-push hook already installed %s", gitHookFile.getAbsolutePath());
-			return;
+			logger.info("Git pre-push hook already installed, reinstalling it");
+			uninstall(gitHookFile);
 		}
 
 		hookContent += preHookContent();
-		writeFile(gitHookFile, hookContent);
+		writeFile(gitHookFile, hookContent, true);
 
 		logger.info("Git pre-push hook installed successfully to the file %s", gitHookFile.getAbsolutePath());
 	}
 
+	/**
+	 * Uninstalls the Spotless Git pre-push hook from the specified hook file by removing
+	 * the custom hook content between the defined hook markers.
+	 *
+	 * <p>This method:
+	 * <ul>
+	 *   <li>Reads the entire content of the pre-push hook file</li>
+	 *   <li>Identifies the Spotless hook section using predefined markers</li>
+	 *   <li>Removes the Spotless hook content while preserving other hook content</li>
+	 *   <li>Writes the modified content back to the hook file</li>
+	 * </ul>
+	 *
+	 * @param gitHookFile The Git pre-push hook file from which to remove the Spotless hook
+	 * @throws Exception if any error occurs during the uninstallation process,
+	 *                  such as file reading or writing errors
+	 */
+	private void uninstall(File gitHookFile) throws Exception {
+		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
+		final var hookStart = hook.indexOf(HOOK_HEADLINE);
+		final var hookEnd = hook.indexOf(HOOK_FOOTER) + HOOK_FOOTER.length();
+
+		final var hookScript = hook.substring(hookStart, hookEnd);
+
+		final var uninstalledHook = hook.replace(hookScript, "");
+
+		writeFile(gitHookFile, uninstalledHook, false);
+	}
+
 	/**
 	 * Provides the content of the hook that should be inserted into the pre-push script.
 	 *
@@ -117,6 +145,29 @@ public void install() throws Exception {
 	 */
 	protected abstract String preHookContent();
 
+	/**
+	 * Generates a pre-push template script that defines the commands to check and apply changes
+	 * using an executor and Spotless.
+	 *
+	 * @param executor      The tool to execute the check and apply commands.
+	 * @param commandCheck  The command to check for issues.
+	 * @param commandApply  The command to apply corrections.
+	 * @return A string template representing the Spotless Git pre-push hook content.
+	 */
+	protected String preHookTemplate(String executor, String commandCheck, String commandApply) {
+		var spotlessHook = "\n";
+		spotlessHook += "\n" + HOOK_HEADLINE;
+		spotlessHook += "\nSPOTLESS_EXECUTOR=" + executor;
+		spotlessHook += "\nif ! $SPOTLESS_EXECUTOR " + commandCheck + " ; then";
+		spotlessHook += "\n    echo 1>&2 \"spotless found problems, running " + commandApply + "; commit the result and re-push\"";
+		spotlessHook += "\n    $SPOTLESS_EXECUTOR " + commandApply;
+		spotlessHook += "\n    exit 1";
+		spotlessHook += "\nfi";
+		spotlessHook += "\n" + HOOK_FOOTER;
+		spotlessHook += "\n";
+		return spotlessHook;
+	}
+
 	/**
 	 * Checks if Git is installed by validating the existence of `.git/config` in the repository root.
 	 *
@@ -145,38 +196,17 @@ private boolean isGitHookInstalled(File gitHookFile) throws Exception {
 	 * @param content The content to write into the file.
 	 * @throws IOException if an error occurs while writing to the file.
 	 */
-	private void writeFile(File file, String content) throws IOException {
-		try (final var writer = new FileWriter(file, UTF_8, true)) {
+	private void writeFile(File file, String content, boolean append) throws IOException {
+		try (final var writer = new FileWriter(file, UTF_8, append)) {
 			writer.write(content);
 		}
 	}
 
-	/**
-	 * Generates a pre-push template script that defines the commands to check and apply changes
-	 * using an executor and Spotless.
-	 *
-	 * @param executor      The tool to execute the check and apply commands.
-	 * @param commandCheck  The command to check for issues.
-	 * @param commandApply  The command to apply corrections.
-	 * @return A string template representing the Spotless Git pre-push hook content.
-	 */
-	protected String preHookTemplate(String executor, String commandCheck, String commandApply) {
-		var spotlessHook = "\n";
-		spotlessHook += "\n" + HOOK_HEADLINE;
-		spotlessHook += "\nSPOTLESS_EXECUTOR=" + executor;
-		spotlessHook += "\nif ! $SPOTLESS_EXECUTOR " + commandCheck + " ; then";
-		spotlessHook += "\n    echo 1>&2 \"spotless found problems, running " + commandApply + "; commit the result and re-push\"";
-		spotlessHook += "\n    $SPOTLESS_EXECUTOR " + commandApply;
-		spotlessHook += "\n    exit 1";
-		spotlessHook += "\nfi";
-		spotlessHook += "\n" + HOOK_FOOTER;
-		spotlessHook += "\n\n";
-		return spotlessHook;
-	}
-
 	public interface GitPreHookLogger {
 		void info(String format, Object... arguments);
+
 		void warn(String format, Object... arguments);
+
 		void error(String format, Object... arguments);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
index 8ae6e6cb94..cfed7cdd58 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
@@ -33,7 +33,6 @@ public GitPrePushHookInstallerGradle(GitPreHookLogger logger, File root) {
 		this.gradlew = root.toPath().resolve("gradlew").toFile();
 	}
 
-
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6e6e648ed6..75c7c885c9 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -53,7 +53,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
 
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
-  - [Git hook](#git-hook)
+  - [Git pre-push hook](#git-pre-push-hook)
   - [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), [IntelliJ IDEA](#intellij-idea))
@@ -142,9 +142,34 @@ 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).
 
-### Git hook
+### Git pre-push hook
 
-TODO
+You can install a Git pre-push hook that ensures code is properly formatted before being pushed to a remote repository.
+This helps catch formatting issues early — before CI fails — and is especially useful for teams not using IDE integrations or pre-commit tools.
+
+#### What the hook does
+
+When installed, the Git `pre-push` hook will:
+
+1. Run `spotlessCheck`
+2. If formatting issues are found:
+   - It automatically runs `spotlessApply` to fix them
+   - Aborts the push with a message
+   - You can then commit the changes and push again
+
+This ensures your code is always clean before it leaves your machine.
+
+#### Installation
+
+Run the following task once in your project:
+```console
+gradle spotlessInstallGitPrePushHook
+```
+
+This installs a `.git/hooks/pre-push` script that runs `spotlessCheck`, and runs `spotlessApply` if needed.
+
+> [!WARNING]
+> The hook will not install automatically — you must run the install command manually.
 
 ### Linting
 
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
index 140bb8a755..2d6046d6fe 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
@@ -44,7 +44,7 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 		assertThat(output).contains("Git pre-push hook not found, creating it");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-		final var content = getTestResource("git_pre_hook/pre-push.created")
+		final var content = getTestResource("git_pre_hook/pre-push.created-tpl")
 				.replace("${executor}", "gradle")
 				.replace("${checkCommand}", "spotlessCheck")
 				.replace("${applyCommand}", "spotlessApply");
@@ -73,7 +73,7 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(output).contains("Installing git pre-push hook");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-		final var content = getTestResource("git_pre_hook/pre-push.existing-added")
+		final var content = getTestResource("git_pre_hook/pre-push.existing-added-tpl")
 				.replace("${executor}", "gradle")
 				.replace("${checkCommand}", "spotlessCheck")
 				.replace("${applyCommand}", "spotlessApply");
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 8cd01731ba..ade17248be 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -37,7 +37,7 @@ user@machine repo % mvn spotless:check
 
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
-  - [Git hook](#git-hook)
+  - [Git pre-push hook](#git-pre-push-hook)
   - [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), [cleanthat](#cleanthat), [IntelliJ IDEA](#intellij-idea))
@@ -147,9 +147,34 @@ Spotless consists of a list of formats (in the example above, `misc` and `java`)
 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).
 
 
-### Git hook
+### Git pre-push hook
 
-TODO
+You can install a Git pre-push hook that ensures code is properly formatted before being pushed to a remote repository.
+This helps catch formatting issues early — before CI fails — and is especially useful for teams not using IDE integrations or pre-commit tools.
+
+#### What the hook does
+
+When installed, the Git `pre-push` hook will:
+
+1. Run `spotless:check`
+2. If formatting issues are found:
+  - It automatically runs `spotless:apply` to fix them
+  - Aborts the push with a message
+  - You can then commit the changes and push again
+
+This ensures your code is always clean before it leaves your machine.
+
+#### Installation
+
+Run the following task once in your project:
+```console
+mvn spotless:install-git-pre-push-hook
+```
+
+This installs a `.git/hooks/pre-push` script that runs `spotless:check`, and runs `spotless:apply` if needed.
+
+> [!WARNING]
+> The hook will not install automatically — you must run the install command manually.
 
 ### Binding to maven phase
 
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
index b9d5d6a343..dd11e10c36 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
@@ -41,8 +41,8 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 		assertThat(output).contains("Git pre-push hook not found, creating it");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-		final var content = getTestResource("git_pre_hook/pre-push.created")
-				.replace("${executor}", "mvn")
+		final var content = getTestResource("git_pre_hook/pre-push.created-tpl")
+				.replace("${executor}", newFile("mvnw").getAbsolutePath())
 				.replace("${checkCommand}", "spotless:check")
 				.replace("${applyCommand}", "spotless:apply");
 		assertFile(".git/hooks/pre-push").hasContent(content);
@@ -67,8 +67,8 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(output).contains("Installing git pre-push hook");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-		final var content = getTestResource("git_pre_hook/pre-push.existing-added")
-				.replace("${executor}", "mvn")
+		final var content = getTestResource("git_pre_hook/pre-push.existing-added-tpl")
+				.replace("${executor}", newFile("mvnw").getAbsolutePath())
 				.replace("${checkCommand}", "spotless:check")
 				.replace("${applyCommand}", "spotless:apply");
 		assertFile(".git/hooks/pre-push").hasContent(content);
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.created b/testlib/src/main/resources/git_pre_hook/pre-push.created-tpl
similarity index 99%
rename from testlib/src/main/resources/git_pre_hook/pre-push.created
rename to testlib/src/main/resources/git_pre_hook/pre-push.created-tpl
index 376598c605..8edbebebf6 100644
--- a/testlib/src/main/resources/git_pre_hook/pre-push.created
+++ b/testlib/src/main/resources/git_pre_hook/pre-push.created-tpl
@@ -9,4 +9,3 @@ if ! $SPOTLESS_EXECUTOR ${checkCommand} ; then
     exit 1
 fi
 ##### SPOTLESS HOOK END #####
-
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.existing-added b/testlib/src/main/resources/git_pre_hook/pre-push.existing-added-tpl
similarity index 99%
rename from testlib/src/main/resources/git_pre_hook/pre-push.existing-added
rename to testlib/src/main/resources/git_pre_hook/pre-push.existing-added-tpl
index fd107efaec..48330e5842 100644
--- a/testlib/src/main/resources/git_pre_hook/pre-push.existing-added
+++ b/testlib/src/main/resources/git_pre_hook/pre-push.existing-added-tpl
@@ -59,4 +59,3 @@ if ! $SPOTLESS_EXECUTOR ${checkCommand} ; then
     exit 1
 fi
 ##### SPOTLESS HOOK END #####
-
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.reinstalled-tpl b/testlib/src/main/resources/git_pre_hook/pre-push.reinstalled-tpl
new file mode 100644
index 0000000000..ef970ea413
--- /dev/null
+++ b/testlib/src/main/resources/git_pre_hook/pre-push.reinstalled-tpl
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+        if test "$local_oid" = "$zero"
+        then
+                # Handle delete
+                :
+        else
+                if test "$remote_oid" = "$zero"
+                then
+                        # New branch, examine all commits
+                        range="$local_oid"
+                else
+                        # Update to existing branch, examine new commits
+                        range="$remote_oid..$local_oid"
+                fi
+
+                # Check for WIP commit
+                commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+                if test -n "$commit"
+                then
+                        echo >&2 "Found WIP commit in $local_ref, not pushing"
+                        exit 1
+                fi
+        fi
+done
+
+
+
+
+
+##### SPOTLESS HOOK START #####
+SPOTLESS_EXECUTOR=${executor}
+if ! $SPOTLESS_EXECUTOR ${checkCommand} ; then
+    echo 1>&2 "spotless found problems, running ${applyCommand}; commit the result and re-push"
+    $SPOTLESS_EXECUTOR ${applyCommand}
+    exit 1
+fi
+##### SPOTLESS HOOK END #####
diff --git a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
index b6fbcd26e8..4cd10ce8b8 100644
--- a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
@@ -74,15 +74,16 @@ public void should_use_global_gradle_when_gradlew_is_not_installed() throws Exce
 		assertThat(logs).element(2).isEqualTo("Gradle wrapper is not installed, using global gradle");
 		assertThat(logs).element(3).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = gradleHookContent("git_pre_hook/pre-push.created", false);
+		final var content = gradleHookContent("git_pre_hook/pre-push.created-tpl", ExecutorType.GLOBAL);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
 	@Test
-	public void should_not_create_pre_hook_file_when_hook_already_installed() throws Exception {
+	public void should_reinstall_pre_hook_file_when_hook_already_installed() throws Exception {
 		// given
 		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
-		final var hookFile = setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing-added");
+		final var installedGlobally = gradleHookContent("git_pre_hook/pre-push.existing-added-tpl", ExecutorType.GLOBAL);
+		final var hookFile = setFile(".git/hooks/pre-push").toContent(installedGlobally);
 
 		setFile("gradlew").toContent("");
 		setFile(".git/config").toContent("");
@@ -91,10 +92,13 @@ public void should_not_create_pre_hook_file_when_hook_already_installed() throws
 		gradle.install();
 
 		// then
-		assertThat(logs).hasSize(2);
+		assertThat(logs).hasSize(3);
 		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
-		assertThat(logs).element(1).isEqualTo("Skipping, git pre-push hook already installed " + hookFile.getAbsolutePath());
-		assertThat(hookFile).content().isEqualTo(getTestResource("git_pre_hook/pre-push.existing-added"));
+		assertThat(logs).element(1).isEqualTo("Git pre-push hook already installed, reinstalling it");
+		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + hookFile.getAbsolutePath());
+
+		final var content = gradleHookContent("git_pre_hook/pre-push.reinstalled-tpl", ExecutorType.WRAPPER);
+		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
 	@Test
@@ -113,7 +117,7 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
 		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = gradleHookContent("git_pre_hook/pre-push.created", true);
+		final var content = gradleHookContent("git_pre_hook/pre-push.created-tpl", ExecutorType.WRAPPER);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
@@ -133,7 +137,7 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = gradleHookContent("git_pre_hook/pre-push.existing-added", true);
+		final var content = gradleHookContent("git_pre_hook/pre-push.existing-added-tpl", ExecutorType.WRAPPER);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
@@ -153,7 +157,7 @@ public void should_create_pre_hook_file_for_maven_when_hook_file_does_not_exists
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
 		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = mavenHookContent("git_pre_hook/pre-push.created", true);
+		final var content = mavenHookContent("git_pre_hook/pre-push.created-tpl", ExecutorType.WRAPPER);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
@@ -173,21 +177,25 @@ public void should_use_global_maven_when_maven_wrapper_is_not_installed() throws
 		assertThat(logs).element(2).isEqualTo("Maven wrapper is not installed, using global maven");
 		assertThat(logs).element(3).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = mavenHookContent("git_pre_hook/pre-push.created", false);
+		final var content = mavenHookContent("git_pre_hook/pre-push.created-tpl", ExecutorType.GLOBAL);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
-	private String gradleHookContent(String resourcePath, boolean isWrapper) {
+	private String gradleHookContent(String resourcePath, ExecutorType executorType) {
 		return getTestResource(resourcePath)
-				.replace("${executor}", isWrapper ? newFile("gradlew").getAbsolutePath() : "gradle")
+				.replace("${executor}", executorType == ExecutorType.WRAPPER ? newFile("gradlew").getAbsolutePath() : "gradle")
 				.replace("${checkCommand}", "spotlessCheck")
 				.replace("${applyCommand}", "spotlessApply");
 	}
 
-	private String mavenHookContent(String resourcePath, boolean isWrapper) {
+	private String mavenHookContent(String resourcePath, ExecutorType executorType) {
 		return getTestResource(resourcePath)
-				.replace("${executor}", isWrapper ? newFile("mvnw").getAbsolutePath() : "mvn")
+				.replace("${executor}", executorType == ExecutorType.WRAPPER ? newFile("mvnw").getAbsolutePath() : "mvn")
 				.replace("${checkCommand}", "spotless:check")
 				.replace("${applyCommand}", "spotless:apply");
 	}
+
+	private enum ExecutorType {
+		WRAPPER, GLOBAL
+	}
 }

From 259ec38f714178310e8625945ed74b83cb9a99ea Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.243>
Date: Fri, 18 Jul 2025 12:53:35 -0700
Subject: [PATCH 193/210] Modify git-hook docs, with an eye towards a future
 where there is both a pre-push hook or a pre-commit hook, depending on what
 the user prefers.

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

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 75c7c885c9..05a99350fd 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -53,7 +53,7 @@ Spotless supports all of Gradle's built-in performance features (incremental bui
 
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
-  - [Git pre-push hook](#git-pre-push-hook)
+  - [Git hook (optional)](#git-hook)
   - [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), [IntelliJ IDEA](#intellij-idea))
@@ -142,16 +142,11 @@ 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).
 
-### Git pre-push hook
+### Git hook
 
-You can install a Git pre-push hook that ensures code is properly formatted before being pushed to a remote repository.
-This helps catch formatting issues early — before CI fails — and is especially useful for teams not using IDE integrations or pre-commit tools.
+If you want, you can run `./gradlew spotlessInstallGitPrePushHook` and it will install a hook such that
 
-#### What the hook does
-
-When installed, the Git `pre-push` hook will:
-
-1. Run `spotlessCheck`
+1. When you push, it runs `spotlessCheck`
 2. If formatting issues are found:
    - It automatically runs `spotlessApply` to fix them
    - Aborts the push with a message
@@ -159,17 +154,7 @@ When installed, the Git `pre-push` hook will:
 
 This ensures your code is always clean before it leaves your machine.
 
-#### Installation
-
-Run the following task once in your project:
-```console
-gradle spotlessInstallGitPrePushHook
-```
-
-This installs a `.git/hooks/pre-push` script that runs `spotlessCheck`, and runs `spotlessApply` if needed.
-
-> [!WARNING]
-> The hook will not install automatically — you must run the install command manually.
+If you prefer instead to have a "pre-commit" hook so that every single commit is clean, see [#623](https://github.com/diffplug/spotless/issues/623) for a workaround or to contribute a permanent fix.
 
 ### Linting
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index ade17248be..50b90ada1f 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -37,7 +37,7 @@ user@machine repo % mvn spotless:check
 
 - [**Quickstart**](#quickstart)
   - [Requirements](#requirements)
-  - [Git pre-push hook](#git-pre-push-hook)
+  - [Git hook (optional)](#git-hook)
   - [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), [cleanthat](#cleanthat), [IntelliJ IDEA](#intellij-idea))
@@ -147,34 +147,19 @@ Spotless consists of a list of formats (in the example above, `misc` and `java`)
 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).
 
 
-### Git pre-push hook
+### Git hook
 
-You can install a Git pre-push hook that ensures code is properly formatted before being pushed to a remote repository.
-This helps catch formatting issues early — before CI fails — and is especially useful for teams not using IDE integrations or pre-commit tools.
+If you want, you can run `mvn spotless:install-git-pre-push-hook` and it will install a hook such that
 
-#### What the hook does
-
-When installed, the Git `pre-push` hook will:
-
-1. Run `spotless:check`
+1. When you push, it runs `spotless:check`
 2. If formatting issues are found:
-  - It automatically runs `spotless:apply` to fix them
-  - Aborts the push with a message
-  - You can then commit the changes and push again
+   - It automatically runs `spotless:apply` to fix them
+   - Aborts the push with a message
+   - You can then commit the changes and push again
 
 This ensures your code is always clean before it leaves your machine.
 
-#### Installation
-
-Run the following task once in your project:
-```console
-mvn spotless:install-git-pre-push-hook
-```
-
-This installs a `.git/hooks/pre-push` script that runs `spotless:check`, and runs `spotless:apply` if needed.
-
-> [!WARNING]
-> The hook will not install automatically — you must run the install command manually.
+If you prefer instead to have a "pre-commit" hook so that every single commit is clean, see [#623](https://github.com/diffplug/spotless/issues/623) for a workaround or to contribute a permanent fix.
 
 ### Binding to maven phase
 

From 2dadeb609c02b26930a30086a277a14d0d0466b7 Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Fri, 18 Jul 2025 20:09:10 -0700
Subject: [PATCH 194/210] uninstall fix

---
 .../spotless/GitPrePushHookInstaller.java     | 55 +++++++++--
 .../GitPrePushHookInstallerGradle.java        |  4 +-
 .../GitPrePushHookInstallerMaven.java         |  4 +-
 .../SpotlessInstallPrePushHookTaskTest.java   |  2 +-
 .../SpotlessInstallPrePushHookMojoTest.java   |  2 +-
 ...pl => pre-push.existing-installed-end-tpl} |  0
 ...=> pre-push.existing-installed-middle-tpl} | 36 ++++++-
 .../pre-push.existing-reinstalled-middle-tpl  | 94 +++++++++++++++++++
 .../spotless/GitPrePushHookInstallerTest.java | 49 +++++++++-
 9 files changed, 227 insertions(+), 19 deletions(-)
 rename testlib/src/main/resources/git_pre_hook/{pre-push.existing-added-tpl => pre-push.existing-installed-end-tpl} (100%)
 rename testlib/src/main/resources/git_pre_hook/{pre-push.reinstalled-tpl => pre-push.existing-installed-middle-tpl} (67%)
 create mode 100644 testlib/src/main/resources/git_pre_hook/pre-push.existing-reinstalled-middle-tpl

diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
index b5070a003b..167e089b7d 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
@@ -31,7 +31,7 @@
  */
 public abstract class GitPrePushHookInstaller {
 
-	private static final String HOOK_HEADLINE = "##### SPOTLESS HOOK START #####";
+	private static final String HOOK_HEADER = "##### SPOTLESS HOOK START #####";
 	private static final String HOOK_FOOTER = "##### SPOTLESS HOOK END #####";
 
 	/**
@@ -128,10 +128,48 @@ public void install() throws Exception {
 	 */
 	private void uninstall(File gitHookFile) throws Exception {
 		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
-		final var hookStart = hook.indexOf(HOOK_HEADLINE);
-		final var hookEnd = hook.indexOf(HOOK_FOOTER) + HOOK_FOOTER.length();
+		final int hookStart = hook.indexOf(HOOK_HEADER);
+		final int hookEnd = hook.indexOf(HOOK_FOOTER) + HOOK_FOOTER.length(); // hookEnd exclusive, so must be last symbol \n
+
+		/* Detailed explanation:
+		 * 1. hook.indexOf(HOOK_FOOTER) - finds the starting position of footer "##### SPOTLESS HOOK END #####"
+		 * 2. + HOOK_FOOTER.length() is needed because String.substring(startIndex, endIndex) treats endIndex as exclusive
+		 *
+		 * For example, if file content is:
+		 * #!/bin/sh
+		 * ##### SPOTLESS HOOK START #####
+		 * ... hook code ...
+		 * ##### SPOTLESS HOOK END #####
+		 * other content
+		 *
+		 * When we later use this in: hook.substring(hookStart, hookEnd)
+		 * - Since substring's endIndex is exclusive (it stops BEFORE that index)
+		 * - We need hookEnd to point to the position AFTER the last '#'
+		 * - This ensures the entire footer "##### SPOTLESS HOOK END #####" is included in the substring
+		 *
+		 * This exclusive behavior is why in the subsequent code:
+		 * if (hook.charAt(hookEnd) == '\n') {
+		 *     hookScript += "\n";
+		 * }
+		 *
+		 * We can directly use hookEnd to check the next character after the footer
+		 * - Since hookEnd is already pointing to the position AFTER the footer
+		 * - No need for hookEnd + 1 in charAt()
+		 * - This makes the code more consistent with the substring's exclusive nature
+		 */
+
+		var hookScript = hook.substring(hookStart, hookEnd);
+		if (hookStart >= 1 && hook.charAt(hookStart - 1) == '\n') {
+			hookScript = "\n" + hookScript;
+		}
+
+		if (hookStart >= 2 && hook.charAt(hookStart - 2) == '\n') {
+			hookScript = "\n" + hookScript;
+		}
 
-		final var hookScript = hook.substring(hookStart, hookEnd);
+		if (hook.charAt(hookEnd) == '\n') {
+			hookScript += "\n";
+		}
 
 		final var uninstalledHook = hook.replace(hookScript, "");
 
@@ -155,8 +193,10 @@ private void uninstall(File gitHookFile) throws Exception {
 	 * @return A string template representing the Spotless Git pre-push hook content.
 	 */
 	protected String preHookTemplate(String executor, String commandCheck, String commandApply) {
-		var spotlessHook = "\n";
-		spotlessHook += "\n" + HOOK_HEADLINE;
+		var spotlessHook = "";
+
+		spotlessHook += "\n";
+		spotlessHook += "\n" + HOOK_HEADER;
 		spotlessHook += "\nSPOTLESS_EXECUTOR=" + executor;
 		spotlessHook += "\nif ! $SPOTLESS_EXECUTOR " + commandCheck + " ; then";
 		spotlessHook += "\n    echo 1>&2 \"spotless found problems, running " + commandApply + "; commit the result and re-push\"";
@@ -165,6 +205,7 @@ protected String preHookTemplate(String executor, String commandCheck, String co
 		spotlessHook += "\nfi";
 		spotlessHook += "\n" + HOOK_FOOTER;
 		spotlessHook += "\n";
+
 		return spotlessHook;
 	}
 
@@ -186,7 +227,7 @@ private boolean isGitInstalled() {
 	 */
 	private boolean isGitHookInstalled(File gitHookFile) throws Exception {
 		final var hook = Files.readString(gitHookFile.toPath(), UTF_8);
-		return hook.contains(HOOK_HEADLINE);
+		return hook.contains(HOOK_HEADER) && hook.contains(HOOK_FOOTER);
 	}
 
 	/**
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
index cfed7cdd58..0b11db5cab 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
@@ -38,10 +38,10 @@ public GitPrePushHookInstallerGradle(GitPreHookLogger logger, File root) {
 	 */
 	@Override
 	protected String preHookContent() {
-		return preHookTemplate(executor(), "spotlessCheck", "spotlessApply");
+		return preHookTemplate(executorPath(), "spotlessCheck", "spotlessApply");
 	}
 
-	private String executor() {
+	private String executorPath() {
 		if (gradlew.exists()) {
 			return gradlew.getAbsolutePath();
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
index 7f84d85429..138d27f9a3 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
@@ -35,10 +35,10 @@ public GitPrePushHookInstallerMaven(GitPreHookLogger logger, File root) {
 	 */
 	@Override
 	protected String preHookContent() {
-		return preHookTemplate(executor(), "spotless:check", "spotless:apply");
+		return preHookTemplate(executorPath(), "spotless:check", "spotless:apply");
 	}
 
-	private String executor() {
+	private String executorPath() {
 		if (mvnw.exists()) {
 			return mvnw.getAbsolutePath();
 		}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
index 2d6046d6fe..d5ff385b82 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessInstallPrePushHookTaskTest.java
@@ -73,7 +73,7 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(output).contains("Installing git pre-push hook");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-		final var content = getTestResource("git_pre_hook/pre-push.existing-added-tpl")
+		final var content = getTestResource("git_pre_hook/pre-push.existing-installed-end-tpl")
 				.replace("${executor}", "gradle")
 				.replace("${checkCommand}", "spotlessCheck")
 				.replace("${applyCommand}", "spotlessApply");
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
index dd11e10c36..ebfc13d982 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
@@ -67,7 +67,7 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(output).contains("Installing git pre-push hook");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-		final var content = getTestResource("git_pre_hook/pre-push.existing-added-tpl")
+		final var content = getTestResource("git_pre_hook/pre-push.existing-installed-end-tpl")
 				.replace("${executor}", newFile("mvnw").getAbsolutePath())
 				.replace("${checkCommand}", "spotless:check")
 				.replace("${applyCommand}", "spotless:apply");
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.existing-added-tpl b/testlib/src/main/resources/git_pre_hook/pre-push.existing-installed-end-tpl
similarity index 100%
rename from testlib/src/main/resources/git_pre_hook/pre-push.existing-added-tpl
rename to testlib/src/main/resources/git_pre_hook/pre-push.existing-installed-end-tpl
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.reinstalled-tpl b/testlib/src/main/resources/git_pre_hook/pre-push.existing-installed-middle-tpl
similarity index 67%
rename from testlib/src/main/resources/git_pre_hook/pre-push.reinstalled-tpl
rename to testlib/src/main/resources/git_pre_hook/pre-push.existing-installed-middle-tpl
index ef970ea413..63f7da0a0b 100644
--- a/testlib/src/main/resources/git_pre_hook/pre-push.reinstalled-tpl
+++ b/testlib/src/main/resources/git_pre_hook/pre-push.existing-installed-middle-tpl
@@ -51,9 +51,6 @@ do
 done
 
 
-
-
-
 ##### SPOTLESS HOOK START #####
 SPOTLESS_EXECUTOR=${executor}
 if ! $SPOTLESS_EXECUTOR ${checkCommand} ; then
@@ -62,3 +59,36 @@ if ! $SPOTLESS_EXECUTOR ${checkCommand} ; then
     exit 1
 fi
 ##### SPOTLESS HOOK END #####
+
+
+# some additional pre-push code
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+        if test "$local_oid" = "$zero"
+        then
+                # Handle delete
+                :
+        else
+                if test "$remote_oid" = "$zero"
+                then
+                        # New branch, examine all commits
+                        range="$local_oid"
+                else
+                        # Update to existing branch, examine new commits
+                        range="$remote_oid..$local_oid"
+                fi
+
+                # Check for WIP commit
+                commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+                if test -n "$commit"
+                then
+                        echo >&2 "Found WIP commit in $local_ref, not pushing"
+                        exit 1
+                fi
+        fi
+done
diff --git a/testlib/src/main/resources/git_pre_hook/pre-push.existing-reinstalled-middle-tpl b/testlib/src/main/resources/git_pre_hook/pre-push.existing-reinstalled-middle-tpl
new file mode 100644
index 0000000000..7265927c13
--- /dev/null
+++ b/testlib/src/main/resources/git_pre_hook/pre-push.existing-reinstalled-middle-tpl
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+        if test "$local_oid" = "$zero"
+        then
+                # Handle delete
+                :
+        else
+                if test "$remote_oid" = "$zero"
+                then
+                        # New branch, examine all commits
+                        range="$local_oid"
+                else
+                        # Update to existing branch, examine new commits
+                        range="$remote_oid..$local_oid"
+                fi
+
+                # Check for WIP commit
+                commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+                if test -n "$commit"
+                then
+                        echo >&2 "Found WIP commit in $local_ref, not pushing"
+                        exit 1
+                fi
+        fi
+done
+
+
+# some additional pre-push code
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+        if test "$local_oid" = "$zero"
+        then
+                # Handle delete
+                :
+        else
+                if test "$remote_oid" = "$zero"
+                then
+                        # New branch, examine all commits
+                        range="$local_oid"
+                else
+                        # Update to existing branch, examine new commits
+                        range="$remote_oid..$local_oid"
+                fi
+
+                # Check for WIP commit
+                commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+                if test -n "$commit"
+                then
+                        echo >&2 "Found WIP commit in $local_ref, not pushing"
+                        exit 1
+                fi
+        fi
+done
+
+
+##### SPOTLESS HOOK START #####
+SPOTLESS_EXECUTOR=${executor}
+if ! $SPOTLESS_EXECUTOR ${checkCommand} ; then
+    echo 1>&2 "spotless found problems, running ${applyCommand}; commit the result and re-push"
+    $SPOTLESS_EXECUTOR ${applyCommand}
+    exit 1
+fi
+##### SPOTLESS HOOK END #####
diff --git a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
index 4cd10ce8b8..6167e26b8c 100644
--- a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
@@ -82,7 +82,7 @@ public void should_use_global_gradle_when_gradlew_is_not_installed() throws Exce
 	public void should_reinstall_pre_hook_file_when_hook_already_installed() throws Exception {
 		// given
 		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
-		final var installedGlobally = gradleHookContent("git_pre_hook/pre-push.existing-added-tpl", ExecutorType.GLOBAL);
+		final var installedGlobally = gradleHookContent("git_pre_hook/pre-push.existing-installed-end-tpl", ExecutorType.GLOBAL);
 		final var hookFile = setFile(".git/hooks/pre-push").toContent(installedGlobally);
 
 		setFile("gradlew").toContent("");
@@ -97,7 +97,50 @@ public void should_reinstall_pre_hook_file_when_hook_already_installed() throws
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook already installed, reinstalling it");
 		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + hookFile.getAbsolutePath());
 
-		final var content = gradleHookContent("git_pre_hook/pre-push.reinstalled-tpl", ExecutorType.WRAPPER);
+		final var content = gradleHookContent("git_pre_hook/pre-push.existing-installed-end-tpl", ExecutorType.WRAPPER);
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	@Test
+	public void should_reinstall_pre_hook_file_when_hook_already_installed_in_the_middle_of_file() throws Exception {
+		// given
+		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
+		final var installedGlobally = gradleHookContent("git_pre_hook/pre-push.existing-installed-middle-tpl", ExecutorType.GLOBAL);
+		final var hookFile = setFile(".git/hooks/pre-push").toContent(installedGlobally);
+
+		setFile("gradlew").toContent("");
+		setFile(".git/config").toContent("");
+
+		// when
+		gradle.install();
+
+		// then
+		assertThat(logs).hasSize(3);
+		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
+		assertThat(logs).element(1).isEqualTo("Git pre-push hook already installed, reinstalling it");
+		assertThat(logs).element(2).isEqualTo("Git pre-push hook installed successfully to the file " + hookFile.getAbsolutePath());
+
+		final var content = gradleHookContent("git_pre_hook/pre-push.existing-reinstalled-middle-tpl", ExecutorType.WRAPPER);
+		assertFile(".git/hooks/pre-push").hasContent(content);
+	}
+
+	@Test
+	public void should_reinstall_a_few_times_pre_hook_file_when_hook_already_installed_in_the_middle_of_file() throws Exception {
+		// given
+		final var gradle = new GitPrePushHookInstallerGradle(logger, rootFolder());
+		final var installedGlobally = gradleHookContent("git_pre_hook/pre-push.existing-installed-middle-tpl", ExecutorType.GLOBAL);
+		setFile(".git/hooks/pre-push").toContent(installedGlobally);
+
+		setFile("gradlew").toContent("");
+		setFile(".git/config").toContent("");
+
+		// when
+		gradle.install();
+		gradle.install();
+		gradle.install();
+
+		// then
+		final var content = gradleHookContent("git_pre_hook/pre-push.existing-reinstalled-middle-tpl", ExecutorType.WRAPPER);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
@@ -137,7 +180,7 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
-		final var content = gradleHookContent("git_pre_hook/pre-push.existing-added-tpl", ExecutorType.WRAPPER);
+		final var content = gradleHookContent("git_pre_hook/pre-push.existing-installed-end-tpl", ExecutorType.WRAPPER);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 

From cee700945d4c5aa50af52d5739fb68de53f7753f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 19 Jul 2025 06:12:35 +0000
Subject: [PATCH 195/210] fix(deps): update jackson monorepo to v2.19.2 (#2558)

* fix(deps): update jackson monorepo to v2.19.2

* Updates

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                                      | 2 +-
 lib/build.gradle                                                | 2 +-
 .../main/java/com/diffplug/spotless/json/JacksonJsonStep.java   | 2 +-
 plugin-gradle/CHANGES.md                                        | 2 +-
 plugin-maven/CHANGES.md                                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e98e32f712..53bdbdfaf7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
-* Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
+* Bump default `jackson` version to latest `2.18.1` -> `2.19.2`. ([#2558](https://github.com/diffplug/spotless/pull/2558))
 * Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
 * Bump default `cleanthat` version to latest `2.22` -> `2.23`. ([#2556](https://github.com/diffplug/spotless/pull/2556))
 
diff --git a/lib/build.gradle b/lib/build.gradle
index 16477b066c..134f3285b5 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -98,7 +98,7 @@ dependencies {
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.13.1'
 	// jackson
-	String VER_JACKSON='2.19.1'
+	String VER_JACKSON='2.19.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 d8f395129e..fe4bf36b30 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.19.1";
+	private static final String DEFAULT_VERSION = "2.19.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 dd1e9c425f..d08e2c2755 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 (
 
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
-* Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
+* Bump default `jackson` version to latest `2.18.1` -> `2.19.2`. ([#2558](https://github.com/diffplug/spotless/pull/2558))
 * Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
 * Bump default `cleanthat` version to latest `2.22` -> `2.23`. ([#2556](https://github.com/diffplug/spotless/pull/2556))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 6829753b2e..72308379e6 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 (
 
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
-* Bump default `jackson` version to latest `2.18.1` -> `2.19.1`. ([#2352](https://github.com/diffplug/spotless/pull/2352))
+* Bump default `jackson` version to latest `2.18.1` -> `2.19.2`. ([#2558](https://github.com/diffplug/spotless/pull/2558))
 * Bump default `gherkin-utils` version to latest `9.0.0` -> `9.2.0`. ([#2408](https://github.com/diffplug/spotless/pull/2408))
 * Bump default `cleanthat` version to latest `2.22` -> `2.23`. ([#2556](https://github.com/diffplug/spotless/pull/2556))
 

From b26c800afef0fb61561f85f6ff27b33705004953 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.243>
Date: Sun, 20 Jul 2025 09:53:09 -0700
Subject: [PATCH 196/210] Update changelogs.

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

diff --git a/CHANGES.md b/CHANGES.md
index 6184c9c851..7a68a5d044 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
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
-- `GitPrePushHookInstaller`, a reusable library component for installing a Git `pre-push` hook that runs formatter checks.
-
+* `GitPrePushHookInstaller`, a reusable library component for installing a Git `pre-push` hook that runs formatter checks.
+* Allow setting Eclipse XML config from a string, not only from files ([#2361](https://github.com/diffplug/spotless/pull/2361))
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.2`. ([#2558](https://github.com/diffplug/spotless/pull/2558))
@@ -42,7 +42,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [3.1.1] - 2025-04-07
 ### Changed
-* Allow setting Eclipse XML config from a string, not only from files ([#2361](https://github.com/diffplug/spotless/pull/2361))
 * 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))
 * Allow multiple npm-based formatters having the same module dependencies, to share a `node_modules` dir without race conditions. [#2462](https://github.com/diffplug/spotless/pull/2462))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index c13377f49b..6e33cab329 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,10 +5,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
-- `spotlessInstallGitPrePushHook` task, which installs a Git `pre-push` hook to run `spotlessCheck` and `spotlessApply`.  
+* `spotlessInstallGitPrePushHook` task, which installs a Git `pre-push` hook to run `spotlessCheck` and `spotlessApply`.  
   Uses shared implementation from `GitPrePushHookInstaller`.  
   [#2553](https://github.com/diffplug/spotless/pull/2553)
-
+* Allow setting Eclipse XML config from a string, not only from files ([#2361](https://github.com/diffplug/spotless/pull/2361))
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.2`. ([#2558](https://github.com/diffplug/spotless/pull/2558))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d7b900689e..c7a2caba7d 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
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
-- `spotless:install-git-pre-push-hook` goal, which installs a Git `pre-push` hook to run `spotless:check` and `spotless:apply`.  
+*`spotless:install-git-pre-push-hook` goal, which installs a Git `pre-push` hook to run `spotless:check` and `spotless:apply`.  
   Uses shared implementation from `GitPrePushHookInstaller`.  
   [#2553](https://github.com/diffplug/spotless/pull/2553)
-
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.2`. ([#2558](https://github.com/diffplug/spotless/pull/2558))

From b12ff7c47f7afb65217f5b1d917c10e221b61f58 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.243>
Date: Sun, 20 Jul 2025 10:00:43 -0700
Subject: [PATCH 197/210] More changelog fixup.

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

diff --git a/CHANGES.md b/CHANGES.md
index 7a68a5d044..92525bbfdc 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
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
-* `GitPrePushHookInstaller`, a reusable library component for installing a Git `pre-push` hook that runs formatter checks.
+* `GitPrePushHookInstaller`, a reusable library component for installing a Git `pre-push` hook that runs formatter checks. ([#2553](https://github.com/diffplug/spotless/pull/2553))
 * Allow setting Eclipse XML config from a string, not only from files ([#2361](https://github.com/diffplug/spotless/pull/2361))
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 6e33cab329..9e3d18ffa6 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
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
-* `spotlessInstallGitPrePushHook` task, which installs a Git `pre-push` hook to run `spotlessCheck` and `spotlessApply`.  
-  Uses shared implementation from `GitPrePushHookInstaller`.  
-  [#2553](https://github.com/diffplug/spotless/pull/2553)
+* `spotlessInstallGitPrePushHook` task, which installs a Git `pre-push` hook to run `spotlessCheck` and `spotlessApply`. ([#2553](https://github.com/diffplug/spotless/pull/2553))
 * Allow setting Eclipse XML config from a string, not only from files ([#2361](https://github.com/diffplug/spotless/pull/2361))
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index c7a2caba7d..b2de9d10ca 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,9 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
-*`spotless:install-git-pre-push-hook` goal, which installs a Git `pre-push` hook to run `spotless:check` and `spotless:apply`.  
-  Uses shared implementation from `GitPrePushHookInstaller`.  
-  [#2553](https://github.com/diffplug/spotless/pull/2553)
+* `spotless:install-git-pre-push-hook` goal, which installs a Git `pre-push` hook to run `spotless:check` and `spotless:apply`. ([#2553](https://github.com/diffplug/spotless/pull/2553))
 ## Changed
 * Bump default `gson` version to latest `2.11.0` -> `2.13.1`. ([#2414](https://github.com/diffplug/spotless/pull/2414))
 * Bump default `jackson` version to latest `2.18.1` -> `2.19.2`. ([#2558](https://github.com/diffplug/spotless/pull/2558))

From 0d0192d39933831eb799e5bf830acc92caf86425 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.243>
Date: Sun, 20 Jul 2025 10:31:48 -0700
Subject: [PATCH 198/210] Use try-with-resources to make sure we don't have
 dangling streams.

---
 .../diffplug/spotless/FormatterProperties.java    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java b/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
index ad180ab77a..499314ee3d 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterProperties.java
@@ -185,12 +185,17 @@ protected Properties executeXmlContent(String content) throws IOException, Illeg
 			}
 
 			private Properties executeWithSupplier(Supplier<InputStream> isSupplier) throws IOException, IllegalArgumentException {
-				Node rootNode = getRootNode(isSupplier.get());
-				String nodeName = rootNode.getNodeName();
-				if (null == nodeName) {
-					throw new IllegalArgumentException("XML document does not contain a root node.");
+				Node rootNode;
+				try (InputStream input = isSupplier.get()) {
+					rootNode = getRootNode(input);
+					String nodeName = rootNode.getNodeName();
+					if (null == nodeName) {
+						throw new IllegalArgumentException("XML document does not contain a root node.");
+					}
+				}
+				try (InputStream input = isSupplier.get()) {
+					return XmlParser.parse(input, rootNode);
 				}
-				return XmlParser.parse(isSupplier.get(), rootNode);
 			}
 
 			private Node getRootNode(final InputStream is) throws IOException, IllegalArgumentException {

From 015df60ea813ebf4d17f90d2e983248179501d5f Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmq0rgcvqdmg.kld0jqb4xyzezgwoaxwmgftyfg.bx.internal.cloudapp.net>
Date: Sun, 20 Jul 2025 18:56:21 +0000
Subject: [PATCH 199/210] Published lib/3.3.0

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

diff --git a/CHANGES.md b/CHANGES.md
index 92525bbfdc..f4ac244ba4 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.3.0] - 2025-07-20
 ### Added
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
 * `GitPrePushHookInstaller`, a reusable library component for installing a Git `pre-push` hook that runs formatter checks. ([#2553](https://github.com/diffplug/spotless/pull/2553))

From 3ce3f7330daf819d7912a8a7e27523beb45a2801 Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmq0rgcvqdmg.kld0jqb4xyzezgwoaxwmgftyfg.bx.internal.cloudapp.net>
Date: Sun, 20 Jul 2025 18:57:12 +0000
Subject: [PATCH 200/210] Published gradle/7.2.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 9e3d18ffa6..0d89813e56 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.2.0] - 2025-07-20
 ### Added
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
 * `spotlessInstallGitPrePushHook` task, which installs a Git `pre-push` hook to run `spotlessCheck` and `spotlessApply`. ([#2553](https://github.com/diffplug/spotless/pull/2553))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index e6b6a37226..c22dab94f7 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.1.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.2.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.1.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.2.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)
@@ -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.1.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.1.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.1.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.1.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.1.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.1.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.1.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.2.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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/7.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/7.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/7.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/7.2.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.2.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.1.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.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.
 
 ### Requirements
 
@@ -189,7 +189,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.1.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.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)
 
 ```gradle
 spotless {
@@ -405,8 +405,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.1.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.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/7.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)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -469,8 +469,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.1.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.1.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.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/7.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)
 
 
 ```gradle
@@ -569,7 +569,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.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)
 
 ```gradle
 spotless {
@@ -601,7 +601,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.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)
 
 ```gradle
 spotless {
@@ -641,7 +641,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.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)
 
 ```gradle
 spotless {
@@ -677,7 +677,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.1.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.2.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.
 
@@ -709,7 +709,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.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)
 
 [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)).
@@ -730,7 +730,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.2.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).
 
@@ -749,7 +749,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.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)
 
 ```gradle
 spotless {
@@ -774,7 +774,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.1.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.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)
 
 ```gradle
 spotless {
@@ -813,7 +813,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.1.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.2.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 {
@@ -862,7 +862,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.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)
 
 ```gradle
 spotless {
@@ -956,7 +956,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.1.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.2.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 {
@@ -1019,7 +1019,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.1.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.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)
 
 ```gradle
 spotless {
@@ -1139,7 +1139,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.2.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 {
@@ -1171,7 +1171,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.2.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 {
@@ -1207,7 +1207,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.1.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.2.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 {
@@ -1236,7 +1236,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.1.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.2.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 {
@@ -1692,7 +1692,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.1.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.2.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1778,9 +1778,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.1.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.2.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.1.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.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!
 
 
 ```gradle
@@ -1813,11 +1813,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.1.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.2.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.1.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.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.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 94da761e14d554ae61f6e665328d7c25d9a86e85 Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmq0rgcvqdmg.kld0jqb4xyzezgwoaxwmgftyfg.bx.internal.cloudapp.net>
Date: Sun, 20 Jul 2025 18:58:42 +0000
Subject: [PATCH 201/210] Published maven/2.46.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 b2de9d10ca..b91be43d79 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.46.0] - 2025-07-20
 ### Added
 * Allow specifying path to Biome JSON config file directly in `biome` step. Requires biome 2.x. ([#2548](https://github.com/diffplug/spotless/pull/2548))
 * `spotless:install-git-pre-push-hook` goal, which installs a Git `pre-push` hook to run `spotless:check` and `spotless:apply`. ([#2553](https://github.com/diffplug/spotless/pull/2553))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 50b90ada1f..ae427d8726 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.45.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.45.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.46.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.46.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 4cf8137acb1fae06147e6d6dd7a7e127aae7de74 Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Sun, 20 Jul 2025 19:28:30 -0700
Subject: [PATCH 202/210] git pre push hook windows fix

---
 .../spotless/GitPrePushHookInstaller.java     |  69 +++++++++-
 .../GitPrePushHookInstallerGradle.java        |  19 +--
 .../GitPrePushHookInstallerMaven.java         |  16 +--
 .../spotless/GitPrePushHookInstallerTest.java | 118 +++++++++++++++++-
 4 files changed, 187 insertions(+), 35 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
index 167e089b7d..7e18b394a5 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
@@ -192,12 +192,12 @@ private void uninstall(File gitHookFile) throws Exception {
 	 * @param commandApply  The command to apply corrections.
 	 * @return A string template representing the Spotless Git pre-push hook content.
 	 */
-	protected String preHookTemplate(String executor, String commandCheck, String commandApply) {
+	protected String preHookTemplate(Executor executor, String commandCheck, String commandApply) {
 		var spotlessHook = "";
 
 		spotlessHook += "\n";
 		spotlessHook += "\n" + HOOK_HEADER;
-		spotlessHook += "\nSPOTLESS_EXECUTOR=" + executor;
+		spotlessHook += "\nSPOTLESS_EXECUTOR=" + executorPath(executor);
 		spotlessHook += "\nif ! $SPOTLESS_EXECUTOR " + commandCheck + " ; then";
 		spotlessHook += "\n    echo 1>&2 \"spotless found problems, running " + commandApply + "; commit the result and re-push\"";
 		spotlessHook += "\n    $SPOTLESS_EXECUTOR " + commandApply;
@@ -209,6 +209,58 @@ protected String preHookTemplate(String executor, String commandCheck, String co
 		return spotlessHook;
 	}
 
+	/**
+	 * Determines the path to the build tool executor (Maven or Gradle).
+	 * This method first checks for the existence of a wrapper script in the project root.
+	 * If the wrapper exists, returns a relative path to it, otherwise returns the global command.
+	 *
+	 * @param executor The build tool executor (GRADLE or MAVEN)
+	 * @return The path to the executor - either the wrapper script path (e.g., "./gradlew")
+	 *         or the global command (e.g., "gradle")
+	 */
+	private String executorPath(Executor executor) {
+		final var wrapper = executorWrapperFile(executor);
+		if (wrapper.exists()) {
+			return "./" + wrapper.getName();
+		}
+
+		logger.info("Local %s wrapper (%s) not found, falling back to global command '%s'",
+			executor.name().toLowerCase(), executor.wrapper, executor.global);
+
+		return executor.global;
+	}
+
+	/**
+	 * Resolves the wrapper script file for the specified build tool executor.
+	 * On Windows systems, checks for both .bat and .cmd extensions.
+	 * On non-Windows systems, uses the wrapper name without extension.
+	 *
+	 * @param executor The build tool executor (GRADLE or MAVEN)
+	 * @return The File object representing the wrapper script
+	 */
+	private File executorWrapperFile(Executor executor) {
+		if (isWindows()) {
+			final var bat = root.toPath().resolve(executor.wrapper + ".bat").toFile();
+			if (bat.exists()) {
+				return bat;
+			}
+
+			return root.toPath().resolve(executor.wrapper + ".cmd").toFile();
+		}
+
+		return root.toPath().resolve(executor.wrapper).toFile();
+	}
+
+	/**
+	 * Checks if the current operating system is Windows.
+	 * This is determined by checking if the "os.name" system property contains "win".
+	 *
+	 * @return true if the current OS is Windows, false otherwise
+	 */
+	private boolean isWindows() {
+		return System.getProperty("os.name").toLowerCase().startsWith("win");
+	}
+
 	/**
 	 * Checks if Git is installed by validating the existence of `.git/config` in the repository root.
 	 *
@@ -243,6 +295,19 @@ private void writeFile(File file, String content, boolean append) throws IOExcep
 		}
 	}
 
+	public enum Executor {
+		GRADLE("gradlew", "gradle"),
+		MAVEN("mvnw", "mvn"), ;
+
+		public final String wrapper;
+		public final String global;
+
+		Executor(String wrapper, String global) {
+			this.wrapper = wrapper;
+			this.global = global;
+		}
+	}
+
 	public interface GitPreHookLogger {
 		void info(String format, Object... arguments);
 
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
index 0b11db5cab..3cc61e566d 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerGradle.java
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless;
 
+import static com.diffplug.spotless.GitPrePushHookInstaller.Executor.GRADLE;
+
 import java.io.File;
 
 /**
@@ -23,14 +25,8 @@
  */
 public class GitPrePushHookInstallerGradle extends GitPrePushHookInstaller {
 
-	/**
-	 * The Gradle wrapper file (`gradlew`) located in the root directory of the project.
-	 */
-	private final File gradlew;
-
 	public GitPrePushHookInstallerGradle(GitPreHookLogger logger, File root) {
 		super(logger, root);
-		this.gradlew = root.toPath().resolve("gradlew").toFile();
 	}
 
 	/**
@@ -38,15 +34,6 @@ public GitPrePushHookInstallerGradle(GitPreHookLogger logger, File root) {
 	 */
 	@Override
 	protected String preHookContent() {
-		return preHookTemplate(executorPath(), "spotlessCheck", "spotlessApply");
-	}
-
-	private String executorPath() {
-		if (gradlew.exists()) {
-			return gradlew.getAbsolutePath();
-		}
-
-		logger.info("Gradle wrapper is not installed, using global gradle");
-		return "gradle";
+		return preHookTemplate(GRADLE, "spotlessCheck", "spotlessApply");
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
index 138d27f9a3..f8b3943335 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstallerMaven.java
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless;
 
+import static com.diffplug.spotless.GitPrePushHookInstaller.Executor.MAVEN;
+
 import java.io.File;
 
 /**
@@ -23,11 +25,8 @@
  */
 public class GitPrePushHookInstallerMaven extends GitPrePushHookInstaller {
 
-	private final File mvnw;
-
 	public GitPrePushHookInstallerMaven(GitPreHookLogger logger, File root) {
 		super(logger, root);
-		this.mvnw = root.toPath().resolve("mvnw").toFile();
 	}
 
 	/**
@@ -35,15 +34,6 @@ public GitPrePushHookInstallerMaven(GitPreHookLogger logger, File root) {
 	 */
 	@Override
 	protected String preHookContent() {
-		return preHookTemplate(executorPath(), "spotless:check", "spotless:apply");
-	}
-
-	private String executorPath() {
-		if (mvnw.exists()) {
-			return mvnw.getAbsolutePath();
-		}
-
-		logger.info("Maven wrapper is not installed, using global maven");
-		return "mvn";
+		return preHookTemplate(MAVEN, "spotless:check", "spotless:apply");
 	}
 }
diff --git a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
index 6167e26b8c..0ac3fa2c1c 100644
--- a/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/GitPrePushHookInstallerTest.java
@@ -15,16 +15,22 @@
  */
 package com.diffplug.spotless;
 
+import static com.diffplug.spotless.GitPrePushHookInstaller.Executor.GRADLE;
+import static com.diffplug.spotless.GitPrePushHookInstaller.Executor.MAVEN;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.GitPrePushHookInstaller.GitPreHookLogger;
 
 class GitPrePushHookInstallerTest extends ResourceHarness {
+	private final static String OS = System.getProperty("os.name");
+
 	private final List<String> logs = new ArrayList<>();
 	private final GitPreHookLogger logger = new GitPreHookLogger() {
 		@Override
@@ -43,6 +49,16 @@ public void error(String format, Object... arguments) {
 		}
 	};
 
+	@BeforeEach
+	public void beforeEach() {
+		System.setProperty("os.name", "linux");
+	}
+
+	@AfterEach
+	public void afterEach() {
+		System.setProperty("os.name", OS);
+	}
+
 	@Test
 	public void should_not_create_pre_hook_file_when_git_is_not_installed() throws Exception {
 		// given
@@ -71,7 +87,7 @@ public void should_use_global_gradle_when_gradlew_is_not_installed() throws Exce
 		assertThat(logs).hasSize(4);
 		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
-		assertThat(logs).element(2).isEqualTo("Gradle wrapper is not installed, using global gradle");
+		assertThat(logs).element(2).isEqualTo("Local gradle wrapper (gradlew) not found, falling back to global command 'gradle'");
 		assertThat(logs).element(3).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
 		final var content = gradleHookContent("git_pre_hook/pre-push.created-tpl", ExecutorType.GLOBAL);
@@ -217,23 +233,117 @@ public void should_use_global_maven_when_maven_wrapper_is_not_installed() throws
 		assertThat(logs).hasSize(4);
 		assertThat(logs).element(0).isEqualTo("Installing git pre-push hook");
 		assertThat(logs).element(1).isEqualTo("Git pre-push hook not found, creating it");
-		assertThat(logs).element(2).isEqualTo("Maven wrapper is not installed, using global maven");
+		assertThat(logs).element(2).isEqualTo("Local maven wrapper (mvnw) not found, falling back to global command 'mvn'");
 		assertThat(logs).element(3).isEqualTo("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push").getAbsolutePath());
 
 		final var content = mavenHookContent("git_pre_hook/pre-push.created-tpl", ExecutorType.GLOBAL);
 		assertFile(".git/hooks/pre-push").hasContent(content);
 	}
 
+	@Test
+	public void should_use_maven_bat_wrapper_when_exists_for_windows() {
+		// given
+		System.setProperty("os.name", "Windows 10");
+		setFile("mvnw.bat").toContent("");
+		setFile("mvnw.cmd").toContent("");
+
+		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+
+		// when
+		final var hook = gradle.preHookTemplate(MAVEN, "spotless:check", "spotless:apply");
+
+		// then
+		assertThat(hook).contains("SPOTLESS_EXECUTOR=./mvnw.bat");
+	}
+
+	@Test
+	public void should_use_maven_cmd_wrapper_when_exists_for_windows() {
+		// given
+		System.setProperty("os.name", "Windows 10");
+		setFile("mvnw.cmd").toContent("");
+
+		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+
+		// when
+		final var hook = gradle.preHookTemplate(MAVEN, "spotless:check", "spotless:apply");
+
+		// then
+		assertThat(hook).contains("SPOTLESS_EXECUTOR=./mvnw.cmd");
+	}
+
+	@Test
+	public void should_use_maven_global_when_bat_and_cmd_files_not_exists_for_windows() {
+		// given
+		System.setProperty("os.name", "Windows 10");
+		setFile("mvnw").toContent("");
+
+		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+
+		// when
+		final var hook = gradle.preHookTemplate(MAVEN, "spotless:check", "spotless:apply");
+
+		// then
+		assertThat(hook).contains("SPOTLESS_EXECUTOR=mvn");
+	}
+
+	@Test
+	public void should_use_gradle_bat_wrapper_when_exists_for_windows() {
+		// given
+		System.setProperty("os.name", "Windows 10");
+		setFile("gradlew.bat").toContent("");
+		setFile("gradlew.cmd").toContent("");
+		setFile("gradlew").toContent("");
+
+		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+
+		// when
+		final var hook = gradle.preHookTemplate(GRADLE, "spotlessCheck", "spotlessApply");
+
+		// then
+		assertThat(hook).contains("SPOTLESS_EXECUTOR=./gradlew.bat");
+	}
+
+	@Test
+	public void should_use_gradle_cmd_wrapper_when_exists_for_windows() {
+		// given
+		System.setProperty("os.name", "Windows 10");
+		setFile("gradlew.cmd").toContent("");
+		setFile("gradlew").toContent("");
+
+		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+
+		// when
+		final var hook = gradle.preHookTemplate(GRADLE, "spotlessCheck", "spotlessApply");
+
+		// then
+		assertThat(hook).contains("SPOTLESS_EXECUTOR=./gradlew.cmd");
+	}
+
+	@Test
+	public void should_use_gradle_global_when_bat_and_cmd_files_not_exists_for_windows() {
+		// given
+		System.setProperty("os.name", "Windows 10");
+		setFile("gradlew").toContent("");
+
+		final var gradle = new GitPrePushHookInstallerMaven(logger, rootFolder());
+
+		// when
+		final var hook = gradle.preHookTemplate(GRADLE, "spotlessCheck", "spotlessApply");
+
+		// then
+		assertThat(hook).contains("SPOTLESS_EXECUTOR=gradle");
+	}
+
 	private String gradleHookContent(String resourcePath, ExecutorType executorType) {
 		return getTestResource(resourcePath)
-				.replace("${executor}", executorType == ExecutorType.WRAPPER ? newFile("gradlew").getAbsolutePath() : "gradle")
+				.replace("${executor}", executorType == ExecutorType.WRAPPER ? "./" + newFile("gradlew").getName() : "gradle")
 				.replace("${checkCommand}", "spotlessCheck")
 				.replace("${applyCommand}", "spotlessApply");
 	}
 
 	private String mavenHookContent(String resourcePath, ExecutorType executorType) {
 		return getTestResource(resourcePath)
-				.replace("${executor}", executorType == ExecutorType.WRAPPER ? newFile("mvnw").getAbsolutePath() : "mvn")
+				.replace("${executor}", executorType == ExecutorType.WRAPPER ? "./" + newFile("mvnw").getName() : "mvn")
 				.replace("${checkCommand}", "spotless:check")
 				.replace("${applyCommand}", "spotless:apply");
 	}

From 1042742744e7f273a019dc4e21566244a5585306 Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Sun, 20 Jul 2025 19:48:18 -0700
Subject: [PATCH 203/210] spotlessApply

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

diff --git a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
index 7e18b394a5..7a627a070c 100644
--- a/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
+++ b/lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java
@@ -22,6 +22,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Locale;
 
 /**
  * Abstract class responsible for installing a Git pre-push hook in a repository.
@@ -225,7 +226,7 @@ private String executorPath(Executor executor) {
 		}
 
 		logger.info("Local %s wrapper (%s) not found, falling back to global command '%s'",
-			executor.name().toLowerCase(), executor.wrapper, executor.global);
+				executor.name().toLowerCase(Locale.ROOT), executor.wrapper, executor.global);
 
 		return executor.global;
 	}
@@ -258,7 +259,7 @@ private File executorWrapperFile(Executor executor) {
 	 * @return true if the current OS is Windows, false otherwise
 	 */
 	private boolean isWindows() {
-		return System.getProperty("os.name").toLowerCase().startsWith("win");
+		return System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win");
 	}
 
 	/**
@@ -296,8 +297,7 @@ private void writeFile(File file, String content, boolean append) throws IOExcep
 	}
 
 	public enum Executor {
-		GRADLE("gradlew", "gradle"),
-		MAVEN("mvnw", "mvn"), ;
+		GRADLE("gradlew", "gradle"), MAVEN("mvnw", "mvn"),;
 
 		public final String wrapper;
 		public final String global;

From b8e80bcd369d7e68d9a7ace6434729aa4194daf7 Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Sun, 20 Jul 2025 20:20:55 -0700
Subject: [PATCH 204/210] tests fix

---
 .../SpotlessInstallPrePushHookMojoTest.java   | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
index ebfc13d982..c6f4c13c76 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
@@ -17,7 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.Locale;
 
 import org.junit.jupiter.api.Test;
 
@@ -41,11 +43,8 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 		assertThat(output).contains("Git pre-push hook not found, creating it");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-		final var content = getTestResource("git_pre_hook/pre-push.created-tpl")
-				.replace("${executor}", newFile("mvnw").getAbsolutePath())
-				.replace("${checkCommand}", "spotless:check")
-				.replace("${applyCommand}", "spotless:apply");
-		assertFile(".git/hooks/pre-push").hasContent(content);
+		final var hookContent = getHookContent("git_pre_hook/pre-push.created-tpl");
+		assertFile(".git/hooks/pre-push").hasContent(hookContent);
 	}
 
 	@Test
@@ -67,11 +66,8 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertThat(output).contains("Installing git pre-push hook");
 		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
 
-		final var content = getTestResource("git_pre_hook/pre-push.existing-installed-end-tpl")
-				.replace("${executor}", newFile("mvnw").getAbsolutePath())
-				.replace("${checkCommand}", "spotless:check")
-				.replace("${applyCommand}", "spotless:apply");
-		assertFile(".git/hooks/pre-push").hasContent(content);
+		final var hookContent = getHookContent("git_pre_hook/pre-push.existing-installed-end-tpl");
+		assertFile(".git/hooks/pre-push").hasContent(hookContent);
 	}
 
 	private void writePomWithJavaLicenseHeaderStep() throws IOException {
@@ -80,4 +76,26 @@ private void writePomWithJavaLicenseHeaderStep() throws IOException {
 				"  <file>${basedir}/license.txt</file>",
 				"</licenseHeader>");
 	}
+
+	private String getHookContent(String resourceFile) {
+		final var executorFile = executorWrapperFile();
+		final var executorPath = executorFile.exists() ? executorFile.getName() : "mvn";
+		return getTestResource(resourceFile)
+				.replace("${executor}", "./" + executorPath)
+				.replace("${checkCommand}", "spotless:check")
+				.replace("${applyCommand}", "spotless:apply");
+	}
+
+	private File executorWrapperFile() {
+		if (System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win")) {
+			final var bat = newFile("mvnw.bat");
+			if (bat.exists()) {
+				return bat;
+			}
+
+			return newFile("mvnw.cmd");
+		}
+
+		return newFile("mvnw");
+	}
 }

From 776f7d15cc523af3db7cbc8b288abaf13dd54516 Mon Sep 17 00:00:00 2001
From: Alex Danylenko <alex.danilenko.dev@gmail.com>
Date: Mon, 21 Jul 2025 00:00:05 -0700
Subject: [PATCH 205/210] execute pre-push hook

---
 .../diffplug/spotless/maven/MavenRunner.java  |   5 +
 .../SpotlessInstallPrePushHookMojoTest.java   | 102 ++++++++++++++++--
 .../git_pre_hook/MissingLicense.test          |  28 +++++
 .../resources/git_pre_hook/TestLicense.txt    |   1 +
 4 files changed, 125 insertions(+), 11 deletions(-)
 create mode 100644 testlib/src/main/resources/git_pre_hook/MissingLicense.test
 create mode 100644 testlib/src/main/resources/git_pre_hook/TestLicense.txt

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 6e22fe5e31..11d52abc92 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
@@ -56,6 +56,11 @@ public MavenRunner withArguments(String... args) {
 		return this;
 	}
 
+	public MavenRunner withEnvironment(String key, String value) {
+		environment.put(key, value);
+		return this;
+	}
+
 	public MavenRunner withRunner(ProcessRunner runner) {
 		this.runner = runner;
 		return this;
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
index c6f4c13c76..dbbb4b1524 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/SpotlessInstallPrePushHookMojoTest.java
@@ -19,24 +19,26 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ProcessRunner;
+
 class SpotlessInstallPrePushHookMojoTest extends MavenIntegrationHarness {
 
 	@Test
 	public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws Exception {
 		// given
 		setFile(".git/config").toContent("");
-		setFile("license.txt").toResource("license/TestLicense");
+		setFile("license.txt").toResource("git_pre_hook/TestLicense.txt");
 		writePomWithJavaLicenseHeaderStep();
 
 		// when
-		final var output = mavenRunner()
-				.withArguments("spotless:install-git-pre-push-hook")
-				.runNoError()
-				.stdOutUtf8();
+		final var output = runMaven("spotless:install-git-pre-push-hook");
 
 		// then
 		assertThat(output).contains("Installing git pre-push hook");
@@ -51,16 +53,13 @@ public void should_create_pre_hook_file_when_hook_file_does_not_exists() throws
 	public void should_append_to_existing_pre_hook_file_when_hook_file_exists() throws Exception {
 		// given
 		setFile(".git/config").toContent("");
-		setFile("license.txt").toResource("license/TestLicense");
+		setFile("license.txt").toResource("git_pre_hook/TestLicense.txt");
 		setFile(".git/hooks/pre-push").toResource("git_pre_hook/pre-push.existing");
 
 		writePomWithJavaLicenseHeaderStep();
 
 		// when
-		final var output = mavenRunner()
-				.withArguments("spotless:install-git-pre-push-hook")
-				.runNoError()
-				.stdOutUtf8();
+		final var output = runMaven("spotless:install-git-pre-push-hook");
 
 		// then
 		assertThat(output).contains("Installing git pre-push hook");
@@ -70,6 +69,30 @@ public void should_append_to_existing_pre_hook_file_when_hook_file_exists() thro
 		assertFile(".git/hooks/pre-push").hasContent(hookContent);
 	}
 
+	@Test
+	public void should_execute_pre_push_script() throws Exception {
+		// given
+		setFile("license.txt").toResource("git_pre_hook/TestLicense.txt");
+		setFile(".git/config").toContent("");
+		setFile("src/main/java/com.github.youribonnaffe.gradle.format/Java8Test.java").toResource("git_pre_hook/MissingLicense.test");
+		writePomWithJavaLicenseHeaderStep();
+
+		// when
+		// install pre-hook
+		final var output = runMaven("spotless:install-git-pre-push-hook");
+
+		final var result = executeHookScript(".git/hooks/pre-push");
+
+		// then
+		assertThat(output).contains("Git pre-push hook installed successfully to the file " + newFile(".git/hooks/pre-push"));
+
+		assertThat(result.stdErrUtf8()).startsWith("spotless found problems, running spotless:apply; commit the result and re-push");
+		assertThat(result.exitCode()).isEqualTo(1);
+
+		final var fileContent = read("src/main/java/com.github.youribonnaffe.gradle.format/Java8Test.java");
+		assertThat(fileContent).startsWith("this is a test license!\n");
+	}
+
 	private void writePomWithJavaLicenseHeaderStep() throws IOException {
 		writePomWithJavaSteps(
 				"<licenseHeader>",
@@ -86,8 +109,12 @@ private String getHookContent(String resourceFile) {
 				.replace("${applyCommand}", "spotless:apply");
 	}
 
+	private boolean isWindows() {
+		return System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win");
+	}
+
 	private File executorWrapperFile() {
-		if (System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win")) {
+		if (isWindows()) {
 			final var bat = newFile("mvnw.bat");
 			if (bat.exists()) {
 				return bat;
@@ -98,4 +125,57 @@ private File executorWrapperFile() {
 
 		return newFile("mvnw");
 	}
+
+	private String runMaven(String command) throws Exception {
+		return mavenRunner()
+				.withArguments(command)
+				.withEnvironment("JAVA_HOME", System.getProperty("java.home"))
+				.runNoError()
+				.stdOutUtf8();
+	}
+
+	private ProcessRunner.Result executeHookScript(String hookFile) throws Exception {
+		try (final var runner = new ProcessRunner()) {
+			String executor = "sh";
+			if (isWindows()) {
+				final var bashPath = findGitBashExecutable();
+				if (bashPath.isEmpty()) {
+					throw new RuntimeException("Could not find git bash executable");
+				}
+
+				executor = bashPath.get();
+			}
+
+			return runner.exec(rootFolder(), Map.of("JAVA_HOME", System.getProperty("java.home")), null, List.of(executor, hookFile));
+		}
+	}
+
+	private Optional<String> findGitBashExecutable() {
+		// 1. Check environment variable
+		final var envPath = System.getenv("GIT_BASH");
+		if (envPath != null && new File(envPath).exists()) {
+			return Optional.of(envPath);
+		}
+
+		// 2. Check common install paths
+		final var commonPaths = List.of(
+				"C:\\Program Files\\Git\\bin\\bash.exe",
+				"C:\\Program Files (x86)\\Git\\bin\\bash.exe",
+				"C:\\Program Files\\Git\\usr\\bin\\bash.exe");
+
+		for (var path : commonPaths) {
+			if (new File(path).exists()) {
+				return Optional.of(path);
+			}
+		}
+
+		// 3. Try bash from PATH
+		try {
+			Process process = new ProcessBuilder("bash", "--version").start();
+			process.waitFor();
+			return Optional.of("bash"); // just use "bash"
+		} catch (Exception e) {
+			return Optional.empty();
+		}
+	}
 }
diff --git a/testlib/src/main/resources/git_pre_hook/MissingLicense.test b/testlib/src/main/resources/git_pre_hook/MissingLicense.test
new file mode 100644
index 0000000000..c81a2412b7
--- /dev/null
+++ b/testlib/src/main/resources/git_pre_hook/MissingLicense.test
@@ -0,0 +1,28 @@
+package com.github.youribonnaffe.gradle.format;
+
+import java.util.function.Function;
+
+
+public class Java8Test {
+    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();
+        }
+    }
+
+    public enum SimpleEnum {
+        A, B, C;
+    }
+}
\ No newline at end of file
diff --git a/testlib/src/main/resources/git_pre_hook/TestLicense.txt b/testlib/src/main/resources/git_pre_hook/TestLicense.txt
new file mode 100644
index 0000000000..2c4c9a3186
--- /dev/null
+++ b/testlib/src/main/resources/git_pre_hook/TestLicense.txt
@@ -0,0 +1 @@
+this is a test license!
\ No newline at end of file

From 222085be8c9a336d9f2bbd6300ac0d818d04d2db Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.243>
Date: Mon, 21 Jul 2025 11:37:15 -0700
Subject: [PATCH 206/210] 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 f4ac244ba4..c708257d88 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
+* `GitPrePushHookInstaller` didn't work on windows, now fixed. ([#2562](https://github.com/diffplug/spotless/pull/2562))
 
 ## [3.3.0] - 2025-07-20
 ### Added
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 0d89813e56..911c0f8717 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
+* `spotlessInstallGitPrePushHook` didn't work on windows, now fixed. ([#2562](https://github.com/diffplug/spotless/pull/2562))
 
 ## [7.2.0] - 2025-07-20
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index b91be43d79..e1a8ac602b 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
+* `spotless:install-git-pre-push-hook` didn't work on windows, now fixed. ([#2562](https://github.com/diffplug/spotless/pull/2562))
 
 ## [2.46.0] - 2025-07-20
 ### Added

From 24ca3bcef169ba3b34f809196bcbaceb98798971 Mon Sep 17 00:00:00 2001
From: ntwigg <ntwigg@10.11.14.243>
Date: Mon, 21 Jul 2025 11:51:58 -0700
Subject: [PATCH 207/210] We should run CI for PRs against `release` also.

---
 .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 dba0ec1d89..b9bd8e1575 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@
 on:
   pull_request:
   push:
-    branches: [main]
+    branches: [main, release]
   workflow_dispatch:
 
 concurrency:

From 314418c2b9fa8210169826e52270e7cc5539531b Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmq0rgcvqdmg.m5t4lhfzhnhutar1pm4xhdw05g.dx.internal.cloudapp.net>
Date: Mon, 21 Jul 2025 19:15:23 +0000
Subject: [PATCH 208/210] Published lib/3.3.1

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

diff --git a/CHANGES.md b/CHANGES.md
index c708257d88..cb2756a827 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.3.1] - 2025-07-21
 ### Fixed
 * `GitPrePushHookInstaller` didn't work on windows, now fixed. ([#2562](https://github.com/diffplug/spotless/pull/2562))
 

From 9e11c9d4a8411876b10d77d81aaf5b4ab312b455 Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmq0rgcvqdmg.m5t4lhfzhnhutar1pm4xhdw05g.dx.internal.cloudapp.net>
Date: Mon, 21 Jul 2025 19:16:20 +0000
Subject: [PATCH 209/210] Published gradle/7.2.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 911c0f8717..54dbc20e68 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.2.1] - 2025-07-21
 ### Fixed
 * `spotlessInstallGitPrePushHook` didn't work on windows, now fixed. ([#2562](https://github.com/diffplug/spotless/pull/2562))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index c22dab94f7..0c9c2526b7 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.2.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-7.2.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.2.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.2.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)
@@ -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.2.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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/7.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/7.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/7.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/7.2.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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/7.2.1/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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/7.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/7.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/7.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/7.2.1/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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/7.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/7.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
 
@@ -189,7 +189,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.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/7.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 {
@@ -405,8 +405,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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/7.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/7.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`.
 
@@ -469,8 +469,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.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/7.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/7.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/7.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
@@ -569,7 +569,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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 {
@@ -601,7 +601,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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 {
@@ -641,7 +641,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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 {
@@ -677,7 +677,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.2.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.2.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.
 
@@ -709,7 +709,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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)).
@@ -730,7 +730,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.2.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.2.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).
 
@@ -749,7 +749,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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 {
@@ -774,7 +774,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.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/7.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 {
@@ -813,7 +813,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.2.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.2.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 {
@@ -862,7 +862,7 @@ spotless {
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.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/7.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 {
@@ -956,7 +956,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.2.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.2.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 {
@@ -1019,7 +1019,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.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/7.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 {
@@ -1139,7 +1139,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.2.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.2.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 {
@@ -1171,7 +1171,7 @@ spotless {
 
 ## Shell
 
-`com.diffplug.gradle.spotless.ShellExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.2.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.2.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 {
@@ -1207,7 +1207,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.2.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.2.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 {
@@ -1236,7 +1236,7 @@ spotless {
 
 ## CSS
 
-`com.diffplug.gradle.spotless.CssExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.2.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.2.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 {
@@ -1692,7 +1692,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.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/7.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>
 
@@ -1778,9 +1778,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.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/7.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/7.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/7.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
@@ -1813,11 +1813,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.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/7.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/7.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/7.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 0572107174aad6709d12d64d4c875b53bb2042ed Mon Sep 17 00:00:00 2001
From: runner
 <runner@pkrvmq0rgcvqdmg.m5t4lhfzhnhutar1pm4xhdw05g.dx.internal.cloudapp.net>
Date: Mon, 21 Jul 2025 19:18:02 +0000
Subject: [PATCH 210/210] Published maven/2.46.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 e1a8ac602b..2f1d93723c 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.46.1] - 2025-07-21
 ### Fixed
 * `spotless:install-git-pre-push-hook` didn't work on windows, now fixed. ([#2562](https://github.com/diffplug/spotless/pull/2562))
 
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index ae427d8726..d0c658d40c 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.46.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.46.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.46.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.46.1/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc