Support sortpom versions back to 3.2.1

Author: mches

CHANGES.md

@@ -19,7 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Removed
 * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945))
 * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954))

lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java

@@ -16,6 +16,7 @@
 package com.diffplug.spotless.glue.pom;
 
 import java.io.*;
+import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 
@@ -46,17 +47,45 @@ public String apply(String input) throws Exception {
 			writer.write(input);
 		}
 		SortPomImpl sortPom = new SortPomImpl();
-		sortPom.setup(new MySortPomLogger(), PluginParameters.builder()
+		PluginParameters.Builder builder = PluginParameters.builder()
 				.setPomFile(pom)
 				.setFileOutput(false, null, null, false)
-				.setEncoding(cfg.encoding)
-				.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement, cfg.keepBlankLines, cfg.endWithNewline)
-				.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation, cfg.indentAttribute)
+				.setEncoding(cfg.encoding);
+		try {
+			builder = builder
+					.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement,
+							cfg.keepBlankLines, cfg.endWithNewline);
+		} catch (NoSuchMethodError e) {
+			try {
+				Method method = PluginParameters.Builder.class
+						.getMethod("setFormatting", String.class, boolean.class, boolean.class, boolean.class);
+				builder = (PluginParameters.Builder) method
+						.invoke(builder, cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement,
+								cfg.keepBlankLines);
+			} catch (Exception ignore) {
+				throw e;
+			}
+		}
+		try {
+			builder = builder
+					.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation,
+							cfg.indentAttribute);
+		} catch (NoSuchMethodError e) {
+			try {
+				Method method = PluginParameters.Builder.class
+						.getMethod("setIndent", int.class, boolean.class, boolean.class);
+				builder = (PluginParameters.Builder) method
+						.invoke(builder, cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation);
+			} catch (Exception ignore) {
+				throw e;
+			}
+		}
+		builder = builder
 				.setSortOrder(cfg.sortOrderFile, cfg.predefinedSortOrder)
 				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
 						cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
-				.setIgnoreLineSeparators(false)
-				.build());
+				.setIgnoreLineSeparators(false);
+		sortPom.setup(new MySortPomLogger(), builder.build());
 		sortPom.sortPom();
 		return Files.readString(pom.toPath(), Charset.forName(cfg.encoding));
 	}

plugin-gradle/CHANGES.md

@@ -14,7 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082))

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SortPomGradleTest.java

@@ -16,6 +16,8 @@
 package com.diffplug.gradle.spotless;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class SortPomGradleTest extends GradleIntegrationHarness {
 	@Test
@@ -63,8 +65,9 @@ void sortPomWithTarget() throws Exception {
 		assertFile("test.xml").sameAsResource("pom/pom_clean_default.xml");
 	}
 
-	@Test
-	void sortPomWithVersion() throws Exception {
+	@ParameterizedTest
+	@ValueSource(strings = {"3.2.1", "3.3.0", "3.4.1", "4.0.0"})
+	void sortPomWithVersion(String version) throws Exception {
 		// given
 		setFile("build.gradle").toLines(
 				"plugins {",
@@ -73,7 +76,7 @@ void sortPomWithVersion() throws Exception {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"  pom {",
-				"    sortPom '4.0.0'",
+				"    sortPom '" + version + "'",
 				"  }",
 				"}");
 		setFile("pom.xml").toResource("pom/pom_dirty.xml");

plugin-maven/CHANGES.md

@@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))
 * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078))
-* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
+* Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115))
 ### Added
 * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031))
 * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037))