diff --git a/build.gradle b/build.gradle
index ab58084a1f..f9e5add27e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.6.1'
+    id 'com.diffplug.spotless' version '6.7.1'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }
 
diff --git a/gradle.properties b/gradle.properties
index 40d7b3c61d..4b6645c71e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,12 +4,3 @@
 #
 
 version=1.5.0-SNAPSHOT
-
-# Work-around for a Spotless Gradle issue:
-# https://github.com/diffplug/spotless/issues/834#issuecomment-819118761
-org.gradle.jvmargs=\
-  --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED