Skip to content

Commit 9014c35

Browse files
Use spotless / palantirJavaFormat - 2.56.0 for all JDKs
Spotless start using palantir-java-format 2.57.0 on Java 21 - on older jdks different versions are used. It causes a different code format depends on using JDK references: - diffplug/spotless#2447 - diffplug/spotless#2503 - palantir/palantir-java-format#1320 As issue - diffplug/spotless#2503 was closed, reverting spotless plugin to an older version is not a resolution.
1 parent 7230f86 commit 9014c35

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,9 @@ under the License.
975975
<invoker.streamLogsOnFailures>true</invoker.streamLogsOnFailures>
976976
<version.sisu-maven-plugin>0.9.0.M4</version.sisu-maven-plugin>
977977
<version.plexus-utils>4.0.2</version.plexus-utils>
978+
<version.spotless-maven-plugin>2.44.5</version.spotless-maven-plugin>
979+
<!-- we use version 2.56.0 due to: https://github.com/palantir/palantir-java-format/issues/1320 -->
980+
<version.palantirJavaFormat>2.56.0</version.palantirJavaFormat>
978981
<!-- DO NOT UPGRADE to 4: incompatible with Maven 3 -->
979982
<version.plexus-xml>3.0.1</version.plexus-xml>
980983
<versions.junit5>5.13.1</versions.junit5>
@@ -1208,12 +1211,16 @@ under the License.</licenseText>
12081211
<plugin>
12091212
<groupId>com.diffplug.spotless</groupId>
12101213
<artifactId>spotless-maven-plugin</artifactId>
1211-
<version>2.44.5</version>
1214+
<version>${version.spotless-maven-plugin}</version>
12121215
<configuration>
12131216
<java>
12141217
<!-- orders of used formatters are important MPOM-376 -->
12151218
<!-- eg. palantir override importOrder, so should be first -->
1216-
<palantirJavaFormat />
1219+
<palantirJavaFormat>
1220+
<!-- Declare version so that spotless does not choose a version based on JDK version -->
1221+
<!-- https://github.com/diffplug/spotless/issues/2503#issuecomment-2953146277 -->
1222+
<version>${version.palantirJavaFormat}</version>
1223+
</palantirJavaFormat>
12171224
<removeUnusedImports />
12181225
<importOrder>
12191226
<file>config/maven-eclipse-importorder.txt</file>

0 commit comments

Comments
 (0)