diff --git a/build-conventions/build.gradle b/build-conventions/build.gradle
index 924164e7187e..6fa060159e60 100644
--- a/build-conventions/build.gradle
+++ b/build-conventions/build.gradle
@@ -66,6 +66,11 @@ dependencies {
     api buildLibs.shadow.plugin
     api buildLibs.apache.rat
     compileOnly buildLibs.checkstyle
+    constraints {
+      api("org.eclipse.platform:org.eclipse.osgi:3.18.300") {
+        because("Use the same version as we do in spotless gradle plugin at runtime")
+      }
+    }
     api(buildLibs.spotless.plugin) {
       exclude module: "groovy-xml"
     }
diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml
index 643a4915a617..f42ae50f559c 100644
--- a/gradle/build.versions.toml
+++ b/gradle/build.versions.toml
@@ -39,6 +39,6 @@ shadow-plugin = "gradle.plugin.com.github.johnrengelman:shadow:8.0.0"
 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:6.17.0"
+spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.18.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 4c2cf9575599..0342d78108d2 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -199,34 +199,21 @@
             <sha256 value="e983d13b1051f8dc49820970aa8da80364857cecf46d78d1b509366e523186bd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.diffplug.spotless" name="spotless-lib" version="2.30.0">
-         <artifact name="spotless-lib-2.30.0.jar">
-            <sha256 value="21f4d7fc032bfada42f29e629ce7d894e1a9bcf7dd5aa9b243fedd0c7d24f0a1" origin="Generated by Gradle"/>
+      <component group="com.diffplug.spotless" name="spotless-lib" version="2.38.0">
+         <artifact name="spotless-lib-2.38.0.jar">
+            <sha256 value="de867a4ad15042970c85bd8b822560be501e1d313f588bb8f5ddaab5759219f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.diffplug.spotless" name="spotless-lib" version="2.37.0">
-         <artifact name="spotless-lib-2.37.0.jar">
-            <sha256 value="71ffe1c3c3511ab44454ead09c20b9203cc3a14493453a18d1d8df862659c9fb" origin="Generated by Gradle"/>
+      <component group="com.diffplug.spotless" name="spotless-lib-extra" version="2.38.0">
+         <artifact name="spotless-lib-extra-2.38.0.jar">
+            <sha256 value="ea247cf4548748ad8e8c31101dbb287dbe523faaf57e3a553e834aa6d67118fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.diffplug.spotless" name="spotless-lib-extra" version="2.30.0">
-         <artifact name="spotless-lib-extra-2.30.0.jar">
-            <sha256 value="9b4ce98aa4f5dbc75850fe6d9a79e878d318be718f997e5ea4052c885621baab" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.diffplug.spotless" name="spotless-lib-extra" version="2.37.0">
-         <artifact name="spotless-lib-extra-2.37.0.jar">
-            <sha256 value="9bc857d39085731c1fa2db883c69ad8bdaa104482816f4a56798a124fe60c1f8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="6.11.0">
-         <artifact name="spotless-plugin-gradle-6.11.0.jar">
-            <sha256 value="54293b86170b821115772090bb90aeb466cda6bf9e08b06bacbd3bb94a714e1f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="6.17.0">
-         <artifact name="spotless-plugin-gradle-6.17.0.jar">
-            <sha256 value="8f27c05d31a4389259ba54938c476427ae8a88cc1540d421623fdc6c9fc86f7b" origin="Generated by Gradle"/>
+      <component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="6.18.0">
+         <artifact name="spotless-plugin-gradle-6.18.0.jar">
+            <sha256 value="8f27c05d31a4389259ba54938c476427ae8a88cc1540d421623fdc6c9fc86f7b" origin="Generated by Gradle">
+               <also-trust value="daf622fc8d6dbfe53b7ec08f80ac64fdd2f9cb00f175e69eb91a8f0da1565970"/>
+            </sha256>
          </artifact>
       </component>
       <component group="com.ethlo.time" name="itu" version="1.7.0">
@@ -499,14 +486,9 @@
             <sha256 value="baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.errorprone" name="error_prone_annotations" version="2.7.1">
-         <artifact name="error_prone_annotations-2.7.1.jar">
-            <sha256 value="cd5257c08a246cf8628817ae71cb822be192ef91f6881ca4a3fcff4f1de1cff3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.google.googlejavaformat" name="google-java-format" version="1.15.0">
-         <artifact name="google-java-format-1.15.0.jar">
-            <sha256 value="4f546cfe159547ac3b9547daa9649e728f6abc254979c975f1cb9971793692c3" origin="Generated by Gradle"/>
+      <component group="com.google.googlejavaformat" name="google-java-format" version="1.16.0">
+         <artifact name="google-java-format-1.16.0.jar">
+            <sha256 value="0cff5d0230ba20d538f3f70b2aa68bd33f9fdc69768cde07337c563c23eb7c43" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.guava" name="failureaccess" version="1.0">
@@ -529,11 +511,6 @@
             <sha256 value="63b09db6861011e7fb2481be7790c7fd4b03f0bb884b3de2ecba8823ad19bf3f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.guava" name="guava" version="27.1-jre">
-         <artifact name="guava-27.1-jre.jar">
-            <sha256 value="4a5aa70cc968a4d137e599ad37553e5cfeed2265e8c193476d7119036c536fe7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.guava" name="guava" version="28.2-jre">
          <artifact name="guava-28.2-jre.jar">
             <sha256 value="fc3aa363ad87223d1fbea584eee015a862150f6d34c71f24dc74088a635f08ef" origin="Generated by Gradle"/>
@@ -1119,9 +1096,9 @@
             <sha256 value="c02730010ecc60ed49fb23e5ec25f678789a2c1a2582835806bc0ae6100ee109" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="dev.equo.ide" name="solstice" version="1.0.0">
-         <artifact name="solstice-1.0.0.jar">
-            <sha256 value="0ce1317572fb65b6045ffde5c4ccf104dd42552dda0fd1621120b92c1c4df16d" origin="Generated by Gradle"/>
+      <component group="dev.equo.ide" name="solstice" version="1.0.3">
+         <artifact name="solstice-1.0.3.jar">
+            <sha256 value="0bfbd724f4ebdbabfc384ba90498702a45b449c92817d2844444713229d2cbf3" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="dnsjava" name="dnsjava" version="2.1.7">
@@ -1963,9 +1940,9 @@
             <sha256 value="f2354b8207926be80debb9edd3108cd0b86eff8e4fe22a9244f214723f96d28e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.felix" name="org.apache.felix.scr" version="2.2.4">
-         <artifact name="org.apache.felix.scr-2.2.4.jar">
-            <sha256 value="f4a14dc142faee676c81757104469895caf0b858c9326416b8246da6abaadd89" origin="Generated by Gradle"/>
+      <component group="org.apache.felix" name="org.apache.felix.scr" version="2.2.6">
+         <artifact name="org.apache.felix.scr-2.2.6.jar">
+            <sha256 value="24c0b2d8081cbc9624e60a1c19f1dd0d104e014cdba4038d9b1aed0ab63721c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.geronimo.specs" name="geronimo-jcache_1.0_spec" version="1.0-alpha-1">
@@ -2939,14 +2916,14 @@
             <sha256 value="97feff80494a54f1b5001f6f4bbdbd45cb64ccbb2dffeb679da9da9be0434b07" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.27.0">
-         <artifact name="org.eclipse.jdt.core-3.27.0.jar">
-            <sha256 value="c84bba71adf3a11db1d2a93dbe2e056eba2e5418f04a437540a7946c24db20c8" origin="Generated by Gradle"/>
+      <component group="org.eclipse.jdt" name="ecj" version="3.33.0">
+         <artifact name="ecj-3.33.0.jar">
+            <sha256 value="f7686c4960cf70c2ebc5c500a73a8cfc04541b730c18f1c5c21329889b137f45" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.32.0">
-         <artifact name="org.eclipse.jdt.core-3.32.0.jar">
-            <sha256 value="cd396e4368b025f8f898ea7b7693fe5b9b1f6981c365c3857420d178132ef945" origin="Generated by Gradle"/>
+      <component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.33.0">
+         <artifact name="org.eclipse.jdt.core-3.33.0.jar">
+            <sha256 value="c03cbbf5ab447d954efb8268a58dd9f2fe70f9e5d9be0a8371f79d785357eba3" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.eclipse.jetty" name="jetty-annotations" version="9.4.40.v20210413">
@@ -3069,6 +3046,11 @@
             <sha256 value="e589b4036723278bcd25e7aa190d1632a58569437a202d5c2b97c7ac9847b874" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.commands" version="3.10.400">
+         <artifact name="org.eclipse.core.commands-3.10.400.jar">
+            <sha256 value="b467c30a1b56029b7338027f8beedd1956f1e19fb0c69b15f56db6968ef3fae6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.platform" name="org.eclipse.core.contenttype" version="3.8.0">
          <artifact name="org.eclipse.core.contenttype-3.8.0.jar">
             <sha256 value="f90fa8dd89b9da7d5e817281f963b46ad1414d33376354e541464434f0b23c90" origin="Generated by Gradle"/>
@@ -3094,29 +3076,14 @@
             <sha256 value="0c4810a1fa6e871c0bb23b29090a72c83b760af8171495c1325b4711b919072b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.12.0">
-         <artifact name="org.eclipse.core.jobs-3.12.0.jar">
-            <sha256 value="98cc919c93c5a1c45e15afc82c64fc2b91a6b4c243bed6925ccdd4e3db3a96e9" origin="Generated by Gradle"/>
+      <component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.13.300">
+         <artifact name="org.eclipse.core.jobs-3.13.300.jar">
+            <sha256 value="eb59627a7fcaf8c57dc34c75e24a8a54963ebfe1b7630d6fc72be882ea91eed4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.13.200">
-         <artifact name="org.eclipse.core.jobs-3.13.200.jar">
-            <sha256 value="f6303d411f5013aac5e3491860392b7fddc09b518d0eb63722b0926679cd9dbf" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.15.100">
-         <artifact name="org.eclipse.core.resources-3.15.100.jar">
-            <sha256 value="428cc4ac13e6d4992f9806d67ee2a80e35005ae3ccd08f1788ed1693a05d35fa" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.18.100">
-         <artifact name="org.eclipse.core.resources-3.18.100.jar">
-            <sha256 value="4607aa2affc287783e498dc01a93d0338a549ffefb00df4b18aef8824622100a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.23.0">
-         <artifact name="org.eclipse.core.runtime-3.23.0.jar">
-            <sha256 value="c81c0fd5c3cb632c93586c80f31461749f43104e3499f53e0cf33525bd606ce3" origin="Generated by Gradle"/>
+      <component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.18.200">
+         <artifact name="org.eclipse.core.resources-3.18.200.jar">
+            <sha256 value="df6e64965c436c96c3d1de0481407a3c5523e320145dac01ca3d2edf4aa66738" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.26.100">
@@ -3124,44 +3091,24 @@
             <sha256 value="f90ebd2f052d602281840b2b8cd1f5a7b6d1cf2d5a85b7b0415c70456855d173" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.6.0">
-         <artifact name="org.eclipse.equinox.app-1.6.0.jar">
-            <sha256 value="745332dac397b823a7e3e3348447339f8fdb1973ceea4851612978ccf80bcc8c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.6.200">
          <artifact name="org.eclipse.equinox.app-1.6.200.jar">
             <sha256 value="52840b5fe48ed8f50a26d792d21b2db73b622a0a10d64c18883da6fb85dcbc24" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.15.0">
-         <artifact name="org.eclipse.equinox.common-3.15.0.jar">
-            <sha256 value="044a3d106f514072b1d0dd48638c1f8ffe93300a05d6943766992449ed9e0b3a" origin="Generated by Gradle"/>
+      <component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.17.100">
+         <artifact name="org.eclipse.equinox.common-3.17.100.jar">
+            <sha256 value="a3464c02a8a2b0c0dd73e00656064b6ab5cb59387c80bef71244ef18caa9d24d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.17.0">
-         <artifact name="org.eclipse.equinox.common-3.17.0.jar">
-            <sha256 value="e85fee16eba255a451cbed66c03dc024267542036bdc590f7b7a6b3092959ada" origin="Generated by Gradle"/>
+      <component group="org.eclipse.platform" name="org.eclipse.equinox.event" version="1.6.200">
+         <artifact name="org.eclipse.equinox.event-1.6.200.jar">
+            <sha256 value="b83c7f7023a3c30daa75e112f3ad2c6d8c30108e19bbe84ec2d25b8bad0efe7a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.platform" name="org.eclipse.equinox.event" version="1.6.100">
-         <artifact name="org.eclipse.equinox.event-1.6.100.jar">
-            <sha256 value="72e27d45e88f47717a1d172cbd1236a7454ba74749b96bb204a3357956621229" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.10.100">
-         <artifact name="org.eclipse.equinox.preferences-3.10.100.jar">
-            <sha256 value="ee791bfa46e35e3551209b89b2152544a6f860a12c4aab4a2f6c9c0cc3dd1dda" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.9.0">
-         <artifact name="org.eclipse.equinox.preferences-3.9.0.jar">
-            <sha256 value="02da6934a2e02d23b9016ec4eb5234733eeafd1f938acc23368b0d30c3567ae9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.11.0">
-         <artifact name="org.eclipse.equinox.registry-3.11.0.jar">
-            <sha256 value="20a89fd326063e7ebe29308fa347a23b377924280038bc4233436d9117a8ba7b" origin="Generated by Gradle"/>
+      <component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.10.200">
+         <artifact name="org.eclipse.equinox.preferences-3.10.200.jar">
+            <sha256 value="3312f21ef759b30a6407ecb1fe8f6b552f2e3661f66bdec55831d05a36aa8ff5" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.11.200">
@@ -3174,19 +3121,9 @@
             <sha256 value="d36dd1d1b0db36a3dad7a7b7f2f93ca48140fc3e663b47b0d56aed5c5e6fd655" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.17.0">
-         <artifact name="org.eclipse.osgi-3.17.0.jar">
-            <sha256 value="b9b5cf6bb057b94be55f3510bdd831cdbaef16f2d1cab6b3770b72452811e538" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.18.200">
-         <artifact name="org.eclipse.osgi-3.18.200.jar">
-            <sha256 value="efa0779f1c0cdabb7fcbced2adbbf8632e1e8e239cb03ed9f37dd40c63a975d2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.eclipse.platform" name="org.eclipse.text" version="3.12.0">
-         <artifact name="org.eclipse.text-3.12.0.jar">
-            <sha256 value="457c1f8af07e870acce65130a2d9aa1e0fd95c92a7667bbd2db5bf7f9f19dd31" origin="Generated by Gradle"/>
+      <component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.18.300">
+         <artifact name="org.eclipse.osgi-3.18.300.jar">
+            <sha256 value="bab943e58edd17309238672dba7a45aec9e2dacbdddb818a8cf17723ea13fa22" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.eclipse.platform" name="org.eclipse.text" version="3.12.300">
@@ -3589,9 +3526,9 @@
             <sha256 value="529da7b6806af4d788acc0aef0079c9c920f6cb1d2679c8f392ca552fb2e1d35" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.osgi" name="org.osgi.service.component" version="1.5.0">
-         <artifact name="org.osgi.service.component-1.5.0.jar">
-            <sha256 value="120a22db8758c0c2c27cb4a7686ca094150ca47067dc8a32d488d79e8beb3609" origin="Generated by Gradle"/>
+      <component group="org.osgi" name="org.osgi.service.component" version="1.5.1">
+         <artifact name="org.osgi.service.component-1.5.1.jar">
+            <sha256 value="0653852deab5c6f6e9c84e3aa8f72e72b9ce7dfaf7a6431f3d80f6f9d7a433ad" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.osgi" name="org.osgi.service.event" version="1.4.1">
@@ -3614,9 +3551,9 @@
             <sha256 value="208819c7c71690c15a6bb8b187474e7f9d0147946b680182a62b9f222ae014ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.osgi" name="org.osgi.util.promise" version="1.2.0">
-         <artifact name="org.osgi.util.promise-1.2.0.jar">
-            <sha256 value="fef86e64f584d012a16a0306160764f6179663b90988a226c4641b920f3a4b36" origin="Generated by Gradle"/>
+      <component group="org.osgi" name="org.osgi.util.promise" version="1.3.0">
+         <artifact name="org.osgi.util.promise-1.3.0.jar">
+            <sha256 value="7053c57e7d7d88fec6b90979a3af125e1d2bb847268a328a2f1ed65ad0a4c185" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.ow2.asm" name="asm" version="5.0.4">