diff --git a/pom.xml b/pom.xml
index c36e02d..745fc1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -916,6 +916,30 @@ under the License.
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>java21</id>
+            <activation>
+                <jdk>[21,)</jdk>
+            </activation>
+
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>com.diffplug.spotless</groupId>
+                            <artifactId>spotless-maven-plugin</artifactId>
+                            <configuration>
+                                <!-- Current google format does not run on Java 21.
+                                     Also, currently there is no existing spotless version supporting both Java 8 and Java 21.
+                                     Don't upgrade it in this profile because it formats code differently.
+                                     Re-evaluate once support for Java 8 is dropped. -->
+                                <skip>true</skip>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
         <profile>
             <id>java11-target</id>
             <build>