diff --git a/gradle.properties b/gradle.properties
index 70f023a..aa04a27 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,5 @@
 group = org.xbib.groovy
 name = groovy-extensions
-version = 5.0.0
+
+# version reflects the groovy version plus a patch level version
+version = 3.0.17.0
diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle
index c62d04a..40aa5df 100644
--- a/gradle/test/junit5.gradle
+++ b/gradle/test/junit5.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    testImplementation libs.junit.jupiter.api
-    testImplementation libs.junit.jupiter.params
-    testImplementation libs.hamcrest
-    testRuntimeOnly libs.junit.jupiter.engine
+    testImplementation testLibs.junit.jupiter.api
+    testImplementation testLibs.junit.jupiter.params
+    testImplementation testLibs.hamcrest
+    testRuntimeOnly testLibs.junit.jupiter.engine
 }
 
 test {
diff --git a/groovy-crypt/gradle.properties b/groovy-crypt/gradle.properties
deleted file mode 100644
index d9af221..0000000
--- a/groovy-crypt/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version = 5.0.0
diff --git a/groovy-ftp/gradle.properties b/groovy-ftp/gradle.properties
deleted file mode 100644
index d9af221..0000000
--- a/groovy-ftp/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version = 5.0.0
diff --git a/groovy-ftps/gradle.properties b/groovy-ftps/gradle.properties
deleted file mode 100644
index d9af221..0000000
--- a/groovy-ftps/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version = 5.0.0
diff --git a/groovy-git/build.gradle b/groovy-git/build.gradle
index 97a2234..90e0d5c 100644
--- a/groovy-git/build.gradle
+++ b/groovy-git/build.gradle
@@ -3,6 +3,6 @@ apply from: rootProject.file('gradle/compile/groovy-dynamic-tests.gradle')
 dependencies {
     api project(':groovy-git-annotations')
     api libs.jgit
-    testImplementation libs.spock.core
-    testImplementation libs.spock.junit4
+    testImplementation testLibs.spock.core
+    testImplementation testLibs.spock.junit4
 }
diff --git a/groovy-git/gradle.properties b/groovy-git/gradle.properties
deleted file mode 100644
index d9af221..0000000
--- a/groovy-git/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version = 5.0.0
diff --git a/groovy-git/src/main/groovy/org/xbib/groovy/git/operation/TagRemoveOp.groovy b/groovy-git/src/main/groovy/org/xbib/groovy/git/operation/TagRemoveOp.groovy
index 9fd0dd2..0d1d327 100644
--- a/groovy-git/src/main/groovy/org/xbib/groovy/git/operation/TagRemoveOp.groovy
+++ b/groovy-git/src/main/groovy/org/xbib/groovy/git/operation/TagRemoveOp.groovy
@@ -26,7 +26,7 @@ class TagRemoveOp implements Callable<List<String>> {
 
     List<String> call() {
         DeleteTagCommand cmd = repo.jgit.tagDelete()
-        cmd.tags = names.collect { new ResolveService(repo).toTagName(it) }
+        cmd.tags = names.collect { new ResolveService(repo).toTagName(it) } as String[]
 
         return cmd.call()
     }
diff --git a/groovy-ldap/gradle.properties b/groovy-ldap/gradle.properties
deleted file mode 100644
index d9af221..0000000
--- a/groovy-ldap/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version = 5.0.0
diff --git a/groovy-mail/gradle.properties b/groovy-mail/gradle.properties
deleted file mode 100644
index d9af221..0000000
--- a/groovy-mail/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version = 5.0.0
diff --git a/groovy-sshd/gradle.properties b/groovy-sshd/gradle.properties
deleted file mode 100644
index d9af221..0000000
--- a/groovy-sshd/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-version = 5.0.0
diff --git a/settings.gradle b/settings.gradle
index 50fa24d..c4c363a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,21 +16,23 @@ dependencyResolutionManagement {
     versionCatalogs {
         libs {
             version('gradle', '8.5')
-            version('groovy', '4.0.17')
-            version('spock', '2.3-groovy-4.0')
+            version('groovy', '3.0.17')
+            library('groovy-core', 'org.codehaus.groovy', 'groovy').versionRef('groovy')
+            library('ftp-fs', 'org.xbib', 'ftp-fs').version('2.6.0')
+            library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.2.1')
+            library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.8.0.202311291450-r')
+            library('mail', 'com.sun.mail', 'javax.mail').version('1.6.2')
+        }
+        testLibs {
             version('junit', '5.10.1')
-            library('groovy-core', 'org.apache.groovy', 'groovy').versionRef('groovy')
-            library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
-            library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock')
+            version('spock', '2.3-groovy-3.0')
             library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
             library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
             library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
             library('junit4', 'junit', 'junit').version('4.13.2')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
-            library('ftp-fs', 'org.xbib', 'ftp-fs').version('2.6.0')
-            library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.2.1')
-            library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.8.0.202311291450-r')
-            library('mail', 'com.sun.mail', 'javax.mail').version('1.6.2')
+            library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
+            library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock')
         }
     }
 }