Merge branch 'main' into js-ts-rome

nedtwigg · web-flow · commit 8dd9b34d8a2d · 2023-05-15T22:37:00.000-07:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -13,6 +13,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * `Jvm.Support` now accepts `-SNAPSHOT` versions, treated as the non`-SNAPSHOT`. ([#1583](https://github.com/diffplug/spotless/issues/1583))
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663
+### Fixed
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
+### Changes
+* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [2.38.0] - 2023-04-06
 ### Added
diff --git a/gradle.properties b/gradle.properties
@@ -32,4 +32,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.5.0.202303070854-r
 VER_JUNIT=5.9.2
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.3.0
+VER_MOCKITO=5.3.1
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
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.extra;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,6 +37,7 @@
 import dev.equo.solstice.p2.P2ClientCache;
 import dev.equo.solstice.p2.P2Model;
 import dev.equo.solstice.p2.P2QueryCache;
+import dev.equo.solstice.p2.P2QueryResult;
 
 /**
  * Generic Eclipse based formatter step {@link State} builder.
@@ -100,7 +102,12 @@ protected void addPlatformRepo(P2Model model, String version) {
 
 	/** Creates the state of the configuration. */
 	EquoBasedStepBuilder.State get() throws Exception {
-		var query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
+		P2QueryResult query;
+		try {
+			query = createModelWithMirrors().query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
+		} catch (Exception x) {
+			throw new IOException("Failed to load " + formatterName + ": " + x, x);
+		}
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
 		mavenDeps.add("dev.equo.ide:solstice:1.0.3");
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -115,7 +115,7 @@ dependencies {
 	// scalafmt
 	scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"
 	// sortPom
-	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'
+	sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.2.1'
 	sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 }
 
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 public class SortPomCfg implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	public String version = "3.2.1";
+
 	public String encoding = "UTF-8";
 
 	public String lineSeparator = System.getProperty("line.separator");
@@ -43,6 +45,8 @@ public class SortPomCfg implements Serializable {
 
 	public String sortDependencies = null;
 
+	public String sortDependencyManagement = null;
+
 	public String sortDependencyExclusions = null;
 
 	public String sortPlugins = null;
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@
 
 public class SortPomStep {
 	public static final String NAME = "sortPom";
+	static final String PACKAGE = "com.github.ekryd.sortpom";
+	static final String MAVEN_COORDINATE = PACKAGE + ":sortpom-sorter:";
 
 	private SortPomStep() {}
 
@@ -42,7 +44,7 @@ static class State implements Serializable {
 
 		public State(SortPomCfg cfg, Provisioner provisioner) throws IOException {
 			this.cfg = cfg;
-			this.jarState = JarState.from("com.github.ekryd.sortpom:sortpom-sorter:3.0.0", provisioner);
+			this.jarState = JarState.from(MAVEN_COORDINATE + cfg.version, provisioner);
 		}
 
 		FormatterFunc createFormat() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,10 @@
  */
 package com.diffplug.spotless.glue.pom;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,10 +39,12 @@ public SortPomFormatterFunc(SortPomCfg cfg) {
 
 	@Override
 	public String apply(String input) throws Exception {
-		// SortPom expects a file to sort, so we write the inpout into a temporary file
+		// SortPom expects a file to sort, so we write the input into a temporary file
 		File pom = File.createTempFile("pom", ".xml");
 		pom.deleteOnExit();
-		IOUtils.write(input, new FileOutputStream(pom), cfg.encoding);
+		try (BufferedWriter writer = new BufferedWriter(new FileWriter(pom, Charset.forName(cfg.encoding)))) {
+			writer.write(input);
+		}
 		SortPomImpl sortPom = new SortPomImpl();
 		sortPom.setup(new MySortPomLogger(), PluginParameters.builder()
 				.setPomFile(pom)
@@ -52,11 +53,12 @@ public String apply(String input) throws Exception {
 				.setFormatting(cfg.lineSeparator, cfg.expandEmptyElements, cfg.spaceBeforeCloseEmptyElement, cfg.keepBlankLines)
 				.setIndent(cfg.nrOfIndentSpace, cfg.indentBlankLines, cfg.indentSchemaLocation)
 				.setSortOrder(cfg.sortOrderFile, cfg.predefinedSortOrder)
-				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
-				.setTriggers(false)
+				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
+						cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
+				.setIgnoreLineSeparators(false)
 				.build());
 		sortPom.sortPom();
-		return IOUtils.toString(new FileInputStream(pom), cfg.encoding);
+		return Files.readString(pom.toPath(), Charset.forName(cfg.encoding));
 	}
 
 	private static class MySortPomLogger implements SortPomLogger {
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -8,6 +8,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ### Fixed
 * Added `@DisableCachingByDefault` to `RegisterDependenciesTask`.
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
+### Changes
+* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [6.18.0] - 2023-04-06
 ### Added
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
@@ -133,9 +133,10 @@ All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.dif
 
 ### Requirements
 
-Spotless requires JRE 8+, and Gradle 6.1.1+.  Some steps require JRE 11+, `Unsupported major.minor version` means you're using a step that needs a newer JRE.
+Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
-If you're stuck on an older version of Gradle, `id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x.
+- If you're stuck on JRE 8, use [`id 'com.diffplug.spotless' version '6.13.0'` or older](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#6130---2023-01-14).
+- If you're stuck on an older version of Gradle, [`id 'com.diffplug.gradle.spotless' version '4.5.1'` supports all the way back to Gradle 2.x](https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md#451---2020-07-04).
 
 <a name="applying-to-java-source"></a>
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -5,6 +5,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. https://github.com/diffplug/spotless/pull/1663### Fixed
+### Fixed
+* `palantir` step now accepts a `style` parameter, which is documentation had already claimed to do. ([#1694](https://github.com/diffplug/spotless/pull/1694))
+* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
+### Changes
+* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
 
 ## [2.36.0] - 2023-04-06
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
@@ -138,7 +138,7 @@ Spotless consists of a list of formats (in the example above, `misc` and `java`)
 
 ### Requirements
 
-Spotless requires Maven to be running on JRE 8+.
+Spotless requires Maven to be running on JRE 11+. To use JRE 8, go back to [`2.30.0` or older](https://github.com/diffplug/spotless/blob/main/plugin-maven/CHANGES.md#2300---2023-01-13).
 
 <a name="applying-to-java-source"></a>
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,13 @@ public class PalantirJavaFormat implements FormatterStepFactory {
 	@Parameter
 	private String version;
 
+	@Parameter
+	private String style;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String version = this.version != null ? this.version : PalantirJavaFormatStep.defaultVersion();
-		return PalantirJavaFormatStep.create(version, config.getProvisioner());
+		String style = this.style != null ? this.style : PalantirJavaFormatStep.defaultStyle();
+		return PalantirJavaFormatStep.create(version, style, config.getProvisioner());
 	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,9 @@
 public class SortPom implements FormatterStepFactory {
 	private final SortPomCfg defaultValues = new SortPomCfg();
 
+	@Parameter
+	String version = defaultValues.version;
+
 	@Parameter
 	String encoding = defaultValues.encoding;
 
@@ -59,6 +62,9 @@ public class SortPom implements FormatterStepFactory {
 	@Parameter
 	String sortDependencies = defaultValues.sortDependencies;
 
+	@Parameter
+	String sortDependencyManagement = defaultValues.sortDependencyManagement;
+
 	@Parameter
 	String sortDependencyExclusions = defaultValues.sortDependencyExclusions;
 
@@ -77,6 +83,7 @@ public class SortPom implements FormatterStepFactory {
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		SortPomCfg cfg = new SortPomCfg();
+		cfg.version = version;
 		cfg.encoding = encoding;
 		cfg.lineSeparator = lineSeparator;
 		cfg.expandEmptyElements = expandEmptyElements;
@@ -88,6 +95,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		cfg.predefinedSortOrder = predefinedSortOrder;
 		cfg.sortOrderFile = sortOrderFile;
 		cfg.sortDependencies = sortDependencies;
+		cfg.sortDependencyManagement = sortDependencyManagement;
 		cfg.sortDependencyExclusions = sortDependencyExclusions;
 		cfg.sortPlugins = sortPlugins;
 		cfg.sortProperties = sortProperties;
diff --git a/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java b/testlib/src/test/java/com/diffplug/spotless/pom/SortPomTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,21 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.Provisioner;
-import com.diffplug.spotless.StepHarness;
-import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.*;
 
-public class SortPomTest {
+public class SortPomTest extends ResourceHarness {
 	@Test
 	public void testSortPomWithDefaultConfig() throws Exception {
 		SortPomCfg cfg = new SortPomCfg();
-		Provisioner provisioner = TestProvisioner.mavenCentral();
-		StepHarness harness = StepHarness.forStep(SortPomStep.create(cfg, provisioner));
-		harness.testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
+		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
+		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
+	}
+
+	@Test
+	public void testSortPomWithVersion() throws Exception {
+		SortPomCfg cfg = new SortPomCfg();
+		cfg.version = "3.2.1";
+		FormatterStep step = SortPomStep.create(cfg, TestProvisioner.mavenCentral());
+		StepHarness.forStep(step).testResource("pom/pom_dirty.xml", "pom/pom_clean_default.xml");
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ dependencies {`
`115`	`115`	`// scalafmt`
`116`	`116`	`scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:3.7.3"`
`117`	`117`	`// sortPom`
`118`		`- sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.0.0'`
	`118`	`+ sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.2.1'`
`119`	`119`	`sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.0'`
`120`	`120`	`}`
`121`	`121`