diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c282f05df..87a939820 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ google-autoservice = "1.0.1"
 google-compiletesting = "0.21.0"
 google-guice = "5.1.0"
 google-guava = "31.1-jre"
-groovy = "3.0.14"
+groovy = "4.0.6"
 h2 = "2.1.214"
 javaee = "8.0.1"
 javax-annotation = "1.3.2"
@@ -27,7 +27,7 @@ reactive-streams = "1.0.4"
 rxjava = "1.2.1"
 rxjava2 = "2.2.21"
 slf4j = "2.0.6"
-spock = "2.1-groovy-3.0"
+spock = "2.3-groovy-4.0"
 spring-asciidoctor = "0.6.1"
 sunjaxb = "4.0.1"
 svgbuilder = "0.4.1"
@@ -43,11 +43,11 @@ google-autoservice = { module = "com.google.auto.service:auto-service", version.
 google-compiletesting = { module = "com.google.testing.compile:compile-testing", version.ref = "google-compiletesting" }
 google-guice = { module = "com.google.inject:guice", version.ref = "google-guice" }
 google-guava = { module = "com.google.guava:guava", version.ref = "google-guava" }
-groovy = { module = "org.codehaus.groovy:groovy", version.ref = "groovy" }
-groovy-all = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
-groovy-dateutil = { module = "org.codehaus.groovy:groovy-dateutil", version.ref = "groovy" }
-groovy-json = { module = "org.codehaus.groovy:groovy-json", version.ref = "groovy" }
-groovy-xml = { module = "org.codehaus.groovy:groovy-xml", version.ref = "groovy" }
+groovy = { module = "org.apache.groovy:groovy", version.ref = "groovy" }
+groovy-all = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }
+groovy-dateutil = { module = "org.apache.groovy:groovy-dateutil", version.ref = "groovy" }
+groovy-json = { module = "org.apache.groovy:groovy-json", version.ref = "groovy" }
+groovy-xml = { module = "org.apache.groovy:groovy-xml", version.ref = "groovy" }
 h2 = { module = "com.h2database:h2", version.ref = "h2" }
 javaee-api = { module = "javax:javaee-api", version.ref = "javaee" }
 jaxb-api = { module = "javax.xml.bind:jaxb-api", version.ref = "jaxb" }