diff --git a/build.gradle b/build.gradle
index 9ae6826..bf3292f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 wrapper {
     gradleVersion = libs.versions.gradle.get()
-    distributionType = Wrapper.DistributionType.ALL
+    distributionType = Wrapper.DistributionType.BIN
 }
 
 ext {
diff --git a/gradle.properties b/gradle.properties
index 70f023a..ee0615f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,5 @@
 group = org.xbib.groovy
 name = groovy-extensions
 version = 5.0.0
+
+org.gradle.warning.mode = all
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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd49..e644113 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e6aba25..b82aa23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85..7101f8e 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
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/settings.gradle b/settings.gradle
index 50fa24d..5ffa2a6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,11 +15,17 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '8.5')
-            version('groovy', '4.0.17')
-            version('spock', '2.3-groovy-4.0')
-            version('junit', '5.10.1')
+            version('gradle', '8.7')
+            version('groovy', '4.0.21')
             library('groovy-core', 'org.apache.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.3.0')
+            library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.9.0.202403050737-r')
+            library('mail', 'com.sun.mail', 'javax.mail').version('1.6.2')
+        }
+        testLibs {
+            version('spock', '2.3-groovy-4.0')
+            version('junit', '5.10.2')
             library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
             library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock')
             library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
@@ -27,10 +33,6 @@ dependencyResolutionManagement {
             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')
         }
     }
 }
@@ -38,8 +40,8 @@ dependencyResolutionManagement {
 include 'groovy-crypt'
 include 'groovy-ftp'
 include 'groovy-ftps'
-include 'groovy-git-annotations'
 include 'groovy-git'
+include 'groovy-git-annotations'
 include 'groovy-ldap'
 include 'groovy-mail'
 include 'groovy-sshd'