Skip to content

Commit 59f435d

Browse files
authored
Merge branch 'master' into release-jdk
2 parents 44a06d8 + 6e19d39 commit 59f435d

1 file changed

Lines changed: 6 additions & 13 deletions

File tree

pom.xml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -975,11 +975,9 @@ under the License.
975975
<version.sisu-maven-plugin>0.9.0.M4</version.sisu-maven-plugin>
976976
<version.plexus-utils>4.0.2</version.plexus-utils>
977977
<version.spotless-maven-plugin>3.0.0</version.spotless-maven-plugin>
978-
<!-- we use version 2.56.0 due to: https://github.com/palantir/palantir-java-format/issues/1320 -->
979-
<version.palantirJavaFormat>2.56.0</version.palantirJavaFormat>
980978
<!-- DO NOT UPGRADE to 4: incompatible with Maven 3 -->
981979
<version.plexus-xml>3.0.1</version.plexus-xml>
982-
<versions.junit5>5.13.4</versions.junit5>
980+
<versions.junit5>5.14.0</versions.junit5>
983981
<version.maven-shared-resources>6</version.maven-shared-resources>
984982
<project.build.outputTimestamp>2025-06-14T08:21:17Z</project.build.outputTimestamp>
985983
</properties>
@@ -1117,7 +1115,7 @@ under the License.</licenseText>
11171115
<plugin>
11181116
<groupId>org.apache.maven.plugins</groupId>
11191117
<artifactId>maven-pmd-plugin</artifactId>
1120-
<version>3.27.0</version>
1118+
<version>3.28.0</version>
11211119
<configuration>
11221120
<targetJdk>${maven.pmd.jdk}</targetJdk>
11231121
<rulesets>
@@ -1187,7 +1185,7 @@ under the License.</licenseText>
11871185
<dependency>
11881186
<groupId>org.codehaus.mojo</groupId>
11891187
<artifactId>extra-enforcer-rules</artifactId>
1190-
<version>1.10.0</version>
1188+
<version>1.11.0</version>
11911189
</dependency>
11921190
</dependencies>
11931191
<executions>
@@ -1215,11 +1213,7 @@ under the License.</licenseText>
12151213
<java>
12161214
<!-- orders of used formatters are important MPOM-376 -->
12171215
<!-- eg. palantir override importOrder, so should be first -->
1218-
<palantirJavaFormat>
1219-
<!-- Declare version so that spotless does not choose a version based on JDK version -->
1220-
<!-- https://github.com/diffplug/spotless/issues/2503#issuecomment-2953146277 -->
1221-
<version>${version.palantirJavaFormat}</version>
1222-
</palantirJavaFormat>
1216+
<palantirJavaFormat />
12231217
<removeUnusedImports />
12241218
<importOrder>
12251219
<file>config/maven-eclipse-importorder.txt</file>
@@ -1388,10 +1382,9 @@ under the License.</licenseText>
13881382
</properties>
13891383
</profile>
13901384
<profile>
1391-
<id>java11+</id>
1385+
<id>java17+</id>
13921386
<activation>
1393-
<!-- TODO check support for JDK 25 after palantirJavaFormat upgraded -->
1394-
<jdk>[11,25)</jdk>
1387+
<jdk>[17,)</jdk>
13951388
</activation>
13961389
<build>
13971390
<!--- newer versions of plugins requires JDK 11 -->

0 commit comments

Comments
 (0)