update dependencies, update to groovy 4.0.22

build.gradle

@@ -19,13 +19,14 @@ ext {
     scmUrl = 'https://xbib.org/' + user + '/' + name
     scmConnection = 'scm:git:git://xbib.org/' + user + '/' + name + '.git'
     scmDeveloperConnection = 'scm:git:ssh://forgejo@xbib.org:' + user + '/' + name + '.git'
-    issueManagementSystem = 'Github'
+    issueManagementSystem = 'Forgejo'
     issueManagementUrl = ext.scmUrl + '/issues'
     licenseName = 'The Apache License, Version 2.0'
     licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
 }
 
 subprojects {
+    apply from: rootProject.file('gradle/repositories/maven.gradle')
     apply from: rootProject.file('gradle/compile/java.gradle')
     apply from: rootProject.file('gradle/test/junit5.gradle')
     apply from: rootProject.file('gradle/publish/maven.gradle')

gradle.properties

@@ -1,5 +1,3 @@
 group = org.xbib.groovy
 name = groovy-extensions
-version = 3.0.17.0
+version = 4.0.22.0
-
-org.gradle.warning.mode = all

gradle/compile/java.gradle

@@ -5,7 +5,6 @@ java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(21)
     }
-    modularity.inferModulePath.set(true)
     withSourcesJar()
     withJavadocJar()
 }

gradle/test/junit5.gradle

@@ -3,6 +3,8 @@ dependencies {
     testImplementation testLibs.junit.jupiter.params
     testImplementation testLibs.hamcrest
     testRuntimeOnly testLibs.junit.jupiter.engine
+    testRuntimeOnly testLibs.junit.jupiter.vintage
+    testRuntimeOnly testLibs.junit.jupiter.platform.launcher
 }
 
 test {

groovy-crypt/gradle.properties

@@ -1 +1 @@
-version = 5.0.0
+version = 4.0.22.0

groovy-ftp/build.gradle

@@ -1,5 +1,5 @@
 apply from: rootProject.file('gradle/compile/groovy.gradle')
 
 dependencies {
-    api libs.ftp.fs
+    api libs.files.ftp.fs
 }

groovy-ftp/gradle.properties

@@ -1 +1 @@
-version = 5.0.0
+version = 4.0.22.0

groovy-ftp/src/main/java/org/xbib/groovy/ftp/FTPContext.java

@@ -1,15 +1,13 @@
 package org.xbib.groovy.ftp;
 
-import org.xbib.io.ftp.fs.FTPEnvironment;
+import org.xbib.files.ftp.fs.FTPEnvironment;
-import org.xbib.io.ftp.fs.FTPFileSystemProvider;
+import org.xbib.files.ftp.fs.FTPFileSystemProvider;
 
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.FileSystem;
 import java.util.Map;
 
-/**
- */
 class FTPContext {
 
     final FTPFileSystemProvider provider;

groovy-ftps/build.gradle

@@ -1,5 +1,5 @@
 apply from: rootProject.file('gradle/compile/groovy.gradle')
 
 dependencies {
-    api libs.ftp.fs
+    api libs.files.ftp.fs
 }

groovy-ftps/gradle.properties

@@ -1 +1 @@
-version = 5.0.0
+version = 4.0.22.0

groovy-ftps/src/main/java/org/xbib/groovy/ftps/FTPSContext.java

@@ -1,7 +1,8 @@
 package org.xbib.groovy.ftps;
 
-import org.xbib.io.ftp.fs.FTPSEnvironment;
+import org.xbib.files.ftp.fs.FTPEnvironment;
-import org.xbib.io.ftp.fs.FTPSFileSystemProvider;
+import org.xbib.files.ftp.fs.FTPSFileSystemProvider;
+
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.FileSystem;
@@ -15,7 +16,7 @@ public class FTPSContext {
 
     FTPSContext(URI uri, Map<String, ?> env) throws IOException {
         this.provider = new FTPSFileSystemProvider();
-        this.fileSystem = provider.newFileSystem(uri, env != null ? env : new FTPSEnvironment());
+        this.fileSystem = provider.newFileSystem(uri, env != null ? env : new FTPEnvironment());
     }
 
     void close() throws IOException {

groovy-ftps/src/test/java/org/xbib/groovy/ftps/FTPSTest.groovy

@@ -1,8 +1,7 @@
 package org.xbib.groovy.ftps
 
 import groovy.util.logging.Log
-import org.junit.Test
+import org.junit.jupiter.api.Test
-import org.xbib.io.ftp.fs.SecurityMode
 
 import java.nio.file.Files
 import java.nio.file.Path

groovy-git/gradle.properties

@@ -1 +1 @@
-version = 3.0.17.0
+version = 4.0.22.0

groovy-ldap/gradle.properties

@@ -1 +1 @@
-version = 5.0.0
+version = 4.0.22.0

groovy-mail/gradle.properties

@@ -1 +1 @@
-version = 5.0.0
+version = 4.0.22.0

groovy-sshd/gradle.properties

@@ -1 +1 @@
-version = 5.0.0
+version = 4.0.22.0

settings.gradle

@@ -16,11 +16,11 @@ dependencyResolutionManagement {
     versionCatalogs {
         libs {
             version('gradle', '8.7')
-            version('groovy', '4.0.21')
+            version('groovy', '4.0.22')
             library('groovy-core', 'org.apache.groovy', 'groovy').versionRef('groovy')
-            library('ftp-fs', 'org.xbib', 'ftp-fs').version('2.6.0')
+            library('files-ftp-fs', 'org.xbib', 'files-ftp-fs').version('4.8.0')
-            library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.3.0')
+            library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.8.0')
-            library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.9.0.202403050737-r')
+            library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.10.0.202406032230-r')
             library('mail', 'com.sun.mail', 'javax.mail').version('1.6.2')
         }
         testLibs {
@@ -31,6 +31,8 @@ dependencyResolutionManagement {
             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('junit-jupiter-vintage', 'org.junit.vintage', 'junit-vintage-engine').versionRef('junit')
+            library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.1')
             library('junit4', 'junit', 'junit').version('4.13.2')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
         }