diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml
index 2b9c626509120..185531d163674 100644
--- a/gradle/build.versions.toml
+++ b/gradle/build.versions.toml
@@ -38,6 +38,6 @@ shadow-plugin = "com.gradleup.shadow:shadow-gradle-plugin:8.3.5"
spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }
-spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.2"
+spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 842387212efcb..7fe2a46ab83d4 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -169,29 +169,54 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -714,11 +739,6 @@
-
-
-
-
-
@@ -1329,11 +1349,6 @@
-
-
-
-
-
@@ -1454,9 +1469,14 @@
-
-
-
+
+
+
+
+
+
+
+
@@ -1982,11 +2002,6 @@
-
-
-
-
-
@@ -2520,9 +2535,9 @@
-
-
-
+
+
+
@@ -3611,14 +3626,19 @@
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -3721,74 +3741,139 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3796,14 +3881,24 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+