From b956f55813a6e0da85235795b5fa7b0da2aa014e Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Mon, 12 Oct 2026 12:23:14 +0000
Subject: [PATCH 1/2] Test JDK 27 instead of 26

JDK 26 is out of support now that 27 is released. Spotless is skipped on
the JDK 27 jobs only: palantir-java-format crashes there until
palantir/palantir-java-format#1786 is released.
---
 .github/workflows/maven.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 139a3a5fd7a8..31210c4f0ba5 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        java: [8, 25, 26]
+        java: [8, 25, 27]
 
       fail-fast: false
     runs-on: ${{ matrix.os }}
@@ -150,7 +150,8 @@ jobs:
 
       - name: Running integration tests
         shell: bash
-        run: ./mvnw install -e -B -V -Prun-its,embedded -Dmaven.repo.local="$HOME/.m2/repository" -DmavenDistro="$GITHUB_WORKSPACE/built-maven/apache-maven-bin.zip" -f maven-integration-testing/pom.xml
+        # palantir-java-format crashes on JDK 27 (palantir/palantir-java-format#1786); drop the skip once a fixed release is in maven-parent
+        run: ./mvnw install -e -B -V -Prun-its,embedded -Dmaven.repo.local="$HOME/.m2/repository" -DmavenDistro="$GITHUB_WORKSPACE/built-maven/apache-maven-bin.zip" -f maven-integration-testing/pom.xml ${{ matrix.java == 27 && '-Dspotless.skip=true' || '' }}
 
       - name: Save ~/.m2/repository
         # pull requests restore the cache without saving their own copy

From f10cb67a6b9e04f3f04446d9e44efcdad64df71d Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Mon, 12 Oct 2026 21:18:48 +0000
Subject: [PATCH 2/2] Skip Spotless on JDK 27 through a POM profile

The IT build gets the same profile from apache/maven-integration-testing.
---
 .github/workflows/maven.yml |  3 +--
 pom.xml                     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 31210c4f0ba5..0032e6e9228c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -150,8 +150,7 @@ jobs:
 
       - name: Running integration tests
         shell: bash
-        # palantir-java-format crashes on JDK 27 (palantir/palantir-java-format#1786); drop the skip once a fixed release is in maven-parent
-        run: ./mvnw install -e -B -V -Prun-its,embedded -Dmaven.repo.local="$HOME/.m2/repository" -DmavenDistro="$GITHUB_WORKSPACE/built-maven/apache-maven-bin.zip" -f maven-integration-testing/pom.xml ${{ matrix.java == 27 && '-Dspotless.skip=true' || '' }}
+        run: ./mvnw install -e -B -V -Prun-its,embedded -Dmaven.repo.local="$HOME/.m2/repository" -DmavenDistro="$GITHUB_WORKSPACE/built-maven/apache-maven-bin.zip" -f maven-integration-testing/pom.xml
 
       - name: Save ~/.m2/repository
         # pull requests restore the cache without saving their own copy
diff --git a/pom.xml b/pom.xml
index c5e248973037..fa1b0d205cdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -746,6 +746,20 @@ under the License.
   </build>
 
   <profiles>
+    <profile>
+      <!-- palantir-java-format crashes on JDK 27 (palantir/palantir-java-format#1786);
+           drop this profile once maven-parent ships a fixed release -->
+      <id>jdk27-skip-spotless</id>
+      <activation>
+        <property>
+          <name>java.specification.version</name>
+          <value>27</value>
+        </property>
+      </activation>
+      <properties>
+        <spotless.skip>true</spotless.skip>
+      </properties>
+    </profile>
     <profile>
       <id>apache-release</id>
       <build>