diff --git a/.github/workflows/data-prepper-performance-test-compile-check.yml b/.github/workflows/data-prepper-performance-test-compile-check.yml
index 968f867dde..837387d07d 100644
--- a/.github/workflows/data-prepper-performance-test-compile-check.yml
+++ b/.github/workflows/data-prepper-performance-test-compile-check.yml
@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [11]
+        java: [11, 17]
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 29463044b5..b11133eb36 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [11]
+        java: [11, 17]
 
     runs-on: ubuntu-latest
 
diff --git a/build.gradle b/build.gradle
index ba65ef344f..b139199288 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.1.0'
+    id 'com.diffplug.spotless' version '6.6.1'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }
 
@@ -250,7 +250,3 @@ task generateThirdPartyReport(type: Copy) {
     rename 'THIRD-PARTY-NOTICES.txt', 'THIRD-PARTY'
     generateThirdPartyReport.dependsOn(generateLicenseReport)
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/docs/developer_guide.md b/docs/developer_guide.md
index 91688225c9..64769b7343 100644
--- a/docs/developer_guide.md
+++ b/docs/developer_guide.md
@@ -10,7 +10,7 @@ First, please read our [contribution guide](../CONTRIBUTING.md) for more informa
 
 ### Java Versions
 
-Building Data Prepper requires JDK 11. The Data Prepper Gradle build runs in a Java 11 JVM, but uses
+Building Data Prepper requires JDK 11 or 17. The Data Prepper Gradle build runs in a Java 11 or 17 JVM, but uses
 [Gradle toolchains](https://docs.gradle.org/current/userguide/toolchains.html) to compile the Java
 code using Java 8. If you have a JDK 8 installed locally, Gradle will use your installed JDK 8. If you
 do not, Gradle will install JDK 8.
diff --git a/gradle.properties b/gradle.properties
index 4b6645c71e..40d7b3c61d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,3 +4,12 @@
 #
 
 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