diff --git a/gradle.properties b/gradle.properties
index 4ee42e0..d9689c1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group = org.xbib.groovy
 name = groovy-extensions
-version = 3.0.9.0
+version = 4.0.2.0
 
 org.gradle.warning.mode = ALL
-groovy.version = 3.0.9
+groovy.version = 4.0.2
 gradle.wrapper.version = 7.3.2
 files.version = 3.0.0
 ftp.version = 2.6.0
@@ -11,4 +11,4 @@ mail.version = 1.6.2
 sshd.version = 2.6.0.0
 junit4.version = 4.13.2
 jgit.version = 5.13.0.202109080827-r
-spock.version = 2.0-groovy-3.0
+spock.version = 2.2-M1-groovy-4.0
diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle
index c70f6b9..d96434e 100644
--- a/gradle/compile/groovy.gradle
+++ b/gradle/compile/groovy.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'groovy'
 
 dependencies {
-    implementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}"
+    implementation "org.apache.groovy:groovy:${project.property('groovy.version')}"
 }
 
 compileGroovy {
diff --git a/groovy-ldap/build.gradle b/groovy-ldap/build.gradle
index 3e524c4..603972d 100644
--- a/groovy-ldap/build.gradle
+++ b/groovy-ldap/build.gradle
@@ -1,6 +1,6 @@
 apply from: rootProject.file('gradle/compile/groovy.gradle')
 
 dependencies {
-    testImplementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}"
+    testImplementation "org.apache.groovy:groovy:${project.property('groovy.version')}"
     testImplementation "junit:junit:${project.property('junit4.version')}"
 }