Skip to content

Commit 8c482cc

Browse files
committed
Sync Spotless Plantir Java Formater with ASF parent pom
1 parent 225ab3c commit 8c482cc

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
@@ -354,6 +354,8 @@ limitations under the License.
354354
<junit5Version>5.13.3</junit5Version>
355355
<njord.version>0.7.5</njord.version>
356356
<spotless.action>apply</spotless.action>
357+
<!-- we use version 2.56.0 due to: https://github.com/palantir/palantir-java-format/issues/1320 -->
358+
<plantirJavaFormatVersion>2.56.0</plantirJavaFormatVersion>
357359
<sisuMavenPluginVersion>0.9.0.M4</sisuMavenPluginVersion>
358360
<invoker.streamLogsOnFailures>true</invoker.streamLogsOnFailures>
359361

@@ -612,7 +614,11 @@ limitations under the License.
612614
<java>
613615
<!-- orders of used formatters are important -->
614616
<!-- eg. palantir override importOrder, so should be first -->
615-
<palantirJavaFormat />
617+
<palantirJavaFormat>
618+
<!-- Declare version so that spotless does not choose a version based on JDK version -->
619+
<!-- https://github.com/diffplug/spotless/issues/2503#issuecomment-2953146277 -->
620+
<version>${plantirJavaFormatVersion}</version>
621+
</palantirJavaFormat>
616622
<removeUnusedImports />
617623
<importOrder>
618624
<order>javax,java,,\#</order>
@@ -625,6 +631,7 @@ limitations under the License.
625631
<expandEmptyElements>false</expandEmptyElements>
626632
<!-- https://issues.apache.org/jira/browse/MRELEASE-1111 -->
627633
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
634+
<quiet>true</quiet>
628635
</sortPom>
629636
</pom>
630637
<markdown>
@@ -888,7 +895,7 @@ limitations under the License.
888895
<profile>
889896
<id>java11+</id>
890897
<activation>
891-
<jdk>[11,)</jdk>
898+
<jdk>[11,25)</jdk>
892899
</activation>
893900

894901
<properties>

0 commit comments

Comments
 (0)