Merge branch 'main' into mvn-protobuf-port

Author: zashroof

CHANGES.md

@@ -17,7 +17,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238))
 * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. 
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 * Bump default `buf` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291))
+### Fixed
+* Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 
 ## [3.0.0.BETA2] - 2024-08-25
 ### Changed

gradle.properties

@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.10.0.202406032230-r
-VER_JUNIT=5.11.1
+VER_JUNIT=5.11.2
 VER_ASSERTJ=3.26.3
 VER_MOCKITO=5.14.1

lib-extra/build.gradle

@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '1.7.7'
+String VER_SOLSTICE = '1.8.0'
 dependencies {
 	api projects.lib
 	// misc useful utilities

lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java

@@ -116,7 +116,7 @@ public FormatterStep build() {
 			}
 			var classpath = new ArrayList<File>();
 			var mavenDeps = new ArrayList<String>();
-			mavenDeps.add("dev.equo.ide:solstice:1.7.7");
+			mavenDeps.add("dev.equo.ide:solstice:1.8.0");
 			mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 			mavenDeps.addAll(query.getJarsOnMavenCentral());
 			classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));

lib/build.gradle

@@ -97,7 +97,7 @@ dependencies {
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
 	// jackson
-	String VER_JACKSON='2.17.2'
+	String VER_JACKSON='2.18.0'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
 	jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON"
 	// ktfmt

lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ final class ImportSorterImpl {
 	private static final String SUBGROUP_SEPARATOR = "|";
 
 	private final List<ImportsGroup> importsGroups;
+	private final Set<String> knownGroupings = new HashSet<>();
 	private final Map<String, List<String>> matchingImports = new HashMap<>();
 	private final List<String> notMatching = new ArrayList<>();
 	private final Set<String> allImportOrderItems = new HashSet<>();
@@ -44,10 +45,12 @@ private static class ImportsGroup {
 
 		private final List<String> subGroups;
 
-		public ImportsGroup(String importOrder) {
+		public ImportsGroup(String importOrder, Set<String> knownGroupings) {
 			this.subGroups = Stream.of(importOrder.split("\\" + SUBGROUP_SEPARATOR, -1))
 					.map(this::normalizeStatic)
+					.filter(group -> !knownGroupings.contains(group))
 					.collect(Collectors.toList());
+			knownGroupings.addAll(this.subGroups);
 		}
 
 		private String normalizeStatic(String subgroup) {
@@ -80,7 +83,7 @@ private List<String> sort(List<String> imports, String lineFormat) {
 
 	private ImportSorterImpl(List<String> importOrder, boolean wildcardsLast, boolean semanticSort,
 			Set<String> treatAsPackage, Set<String> treatAsClass) {
-		importsGroups = importOrder.stream().filter(Objects::nonNull).map(ImportsGroup::new).collect(Collectors.toList());
+		importsGroups = importOrder.stream().filter(Objects::nonNull).map(order -> new ImportsGroup(order, knownGroupings)).collect(Collectors.toList());
 		putStaticItemIfNotExists(importsGroups);
 		putCatchAllGroupIfNotExists(importsGroups);
 
@@ -107,13 +110,13 @@ private void putStaticItemIfNotExists(List<ImportsGroup> importsGroups) {
 				indexOfFirstStatic = i;
 			}
 		}
-		importsGroups.add(indexOfFirstStatic, new ImportsGroup(STATIC_KEYWORD));
+		importsGroups.add(indexOfFirstStatic, new ImportsGroup(STATIC_KEYWORD, this.knownGroupings));
 	}
 
 	private void putCatchAllGroupIfNotExists(List<ImportsGroup> importsGroups) {
 		boolean catchAllSubGroupExist = importsGroups.stream().anyMatch(group -> group.getSubGroups().contains(CATCH_ALL_SUBGROUP));
 		if (!catchAllSubGroupExist) {
-			importsGroups.add(new ImportsGroup(CATCH_ALL_SUBGROUP));
+			importsGroups.add(new ImportsGroup(CATCH_ALL_SUBGROUP, this.knownGroupings));
 		}
 	}
 

lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java

@@ -32,7 +32,7 @@
 public class JacksonJsonStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
-	private static final String DEFAULT_VERSION = "2.17.2";
+	private static final String DEFAULT_VERSION = "2.18.0";
 	public static final String NAME = "jacksonJson";
 
 	private final JarState.Promised jarState;

plugin-gradle/CHANGES.md

@@ -4,13 +4,17 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+### Changed
 * Use the Gradle user home directory by default for the download directory for the biome executable. Previously, the
   plugin tried to use Maven's home directory, which is not always accessible by a Gradle plugin. ([#2187](https://github.com/diffplug/spotless/issues/2187))
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
 ### Changed
+* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
 * Bump default `buf` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291))
+### Fixed
+* Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 
 ## [7.0.0.BETA2] - 2024-08-25
 ### Changed

plugin-maven/CHANGES.md

@@ -11,6 +11,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general
   formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable).
   ([#2259](https://github.com/diffplug/spotless/pull/2259))
+* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279))
+### Fixed
+* Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))
 
 ## [2.44.0.BETA2] - 2024-08-25
 ### Changed

settings.gradle

@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '6.0.23' apply false
+	id 'com.github.spotbugs' version '6.0.24' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md