diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9b6682979b26..3a31e90c9690 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", vers
 gradle-develocity = { module = "com.gradle:develocity-gradle-plugin", version = "3.17.3" }
 gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" }
 gradle-shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }
-gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" }
+gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "7.0.0.BETA1" }
 gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionsPlugin" }
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.21" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
index 8a843846de93..b0b9cfc9314d 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts
@@ -1,7 +1,3 @@
-import com.diffplug.gradle.spotless.SpotlessApply
-import com.diffplug.gradle.spotless.SpotlessCheck
-import com.diffplug.spotless.LineEnding
-
 plugins {
 	id("com.diffplug.spotless")
 }
@@ -51,16 +47,4 @@ spotless {
 			endWithNewline()
 		}
 	}
-
-	// https://github.com/diffplug/spotless/issues/1644
-	lineEndings = LineEnding.UNIX // or any other except GIT_ATTRIBUTES
-}
-
-tasks {
-	withType<SpotlessApply>().configureEach {
-		notCompatibleWithConfigurationCache("https://github.com/diffplug/spotless/issues/644")
-	}
-	withType<SpotlessCheck>().configureEach {
-		notCompatibleWithConfigurationCache("https://github.com/diffplug/spotless/issues/644")
-	}
 }