From 13bba1c0fc1add2a6ccf97f45124ea42e507088f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Tue, 23 Jul 2024 16:25:09 +0200 Subject: [PATCH] update dependencies, update to groovy 4.0.22 --- build.gradle | 3 ++- gradle.properties | 4 +--- gradle/compile/java.gradle | 1 - gradle/test/junit5.gradle | 2 ++ groovy-crypt/gradle.properties | 2 +- groovy-ftp/build.gradle | 2 +- groovy-ftp/gradle.properties | 2 +- .../src/main/java/org/xbib/groovy/ftp/FTPContext.java | 6 ++---- groovy-ftps/build.gradle | 2 +- groovy-ftps/gradle.properties | 2 +- .../main/java/org/xbib/groovy/ftps/FTPSContext.java | 7 ++++--- .../src/test/java/org/xbib/groovy/ftps/FTPSTest.groovy | 3 +-- groovy-git/gradle.properties | 2 +- groovy-ldap/gradle.properties | 2 +- groovy-mail/gradle.properties | 2 +- groovy-sshd/gradle.properties | 2 +- settings.gradle | 10 ++++++---- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index bf3292f..adc7c3e 100644 --- a/build.gradle +++ b/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') diff --git a/gradle.properties b/gradle.properties index f4b36ab..11202c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,3 @@ group = org.xbib.groovy name = groovy-extensions -version = 3.0.17.0 - -org.gradle.warning.mode = all +version = 4.0.22.0 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 4a54098..351995b 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -5,7 +5,6 @@ java { toolchain { languageVersion = JavaLanguageVersion.of(21) } - modularity.inferModulePath.set(true) withSourcesJar() withJavadocJar() } diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index 40aa5df..48e5a87 100644 --- a/gradle/test/junit5.gradle +++ b/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 { diff --git a/groovy-crypt/gradle.properties b/groovy-crypt/gradle.properties index d9af221..a422c50 100644 --- a/groovy-crypt/gradle.properties +++ b/groovy-crypt/gradle.properties @@ -1 +1 @@ -version = 5.0.0 +version = 4.0.22.0 diff --git a/groovy-ftp/build.gradle b/groovy-ftp/build.gradle index d3a9396..7afc4e6 100644 --- a/groovy-ftp/build.gradle +++ b/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 } diff --git a/groovy-ftp/gradle.properties b/groovy-ftp/gradle.properties index d9af221..a422c50 100644 --- a/groovy-ftp/gradle.properties +++ b/groovy-ftp/gradle.properties @@ -1 +1 @@ -version = 5.0.0 +version = 4.0.22.0 diff --git a/groovy-ftp/src/main/java/org/xbib/groovy/ftp/FTPContext.java b/groovy-ftp/src/main/java/org/xbib/groovy/ftp/FTPContext.java index 7d94f53..cf1423c 100644 --- a/groovy-ftp/src/main/java/org/xbib/groovy/ftp/FTPContext.java +++ b/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.io.ftp.fs.FTPFileSystemProvider; +import org.xbib.files.ftp.fs.FTPEnvironment; +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; diff --git a/groovy-ftps/build.gradle b/groovy-ftps/build.gradle index d3a9396..7afc4e6 100644 --- a/groovy-ftps/build.gradle +++ b/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 } diff --git a/groovy-ftps/gradle.properties b/groovy-ftps/gradle.properties index d9af221..a422c50 100644 --- a/groovy-ftps/gradle.properties +++ b/groovy-ftps/gradle.properties @@ -1 +1 @@ -version = 5.0.0 +version = 4.0.22.0 diff --git a/groovy-ftps/src/main/java/org/xbib/groovy/ftps/FTPSContext.java b/groovy-ftps/src/main/java/org/xbib/groovy/ftps/FTPSContext.java index 7cb7136..44c6013 100644 --- a/groovy-ftps/src/main/java/org/xbib/groovy/ftps/FTPSContext.java +++ b/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.io.ftp.fs.FTPSFileSystemProvider; +import org.xbib.files.ftp.fs.FTPEnvironment; +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 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 { diff --git a/groovy-ftps/src/test/java/org/xbib/groovy/ftps/FTPSTest.groovy b/groovy-ftps/src/test/java/org/xbib/groovy/ftps/FTPSTest.groovy index e2544f2..7eae96d 100644 --- a/groovy-ftps/src/test/java/org/xbib/groovy/ftps/FTPSTest.groovy +++ b/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.xbib.io.ftp.fs.SecurityMode +import org.junit.jupiter.api.Test import java.nio.file.Files import java.nio.file.Path diff --git a/groovy-git/gradle.properties b/groovy-git/gradle.properties index 9b757f1..a422c50 100644 --- a/groovy-git/gradle.properties +++ b/groovy-git/gradle.properties @@ -1 +1 @@ -version = 3.0.17.0 +version = 4.0.22.0 diff --git a/groovy-ldap/gradle.properties b/groovy-ldap/gradle.properties index d9af221..a422c50 100644 --- a/groovy-ldap/gradle.properties +++ b/groovy-ldap/gradle.properties @@ -1 +1 @@ -version = 5.0.0 +version = 4.0.22.0 diff --git a/groovy-mail/gradle.properties b/groovy-mail/gradle.properties index d9af221..a422c50 100644 --- a/groovy-mail/gradle.properties +++ b/groovy-mail/gradle.properties @@ -1 +1 @@ -version = 5.0.0 +version = 4.0.22.0 diff --git a/groovy-sshd/gradle.properties b/groovy-sshd/gradle.properties index d9af221..a422c50 100644 --- a/groovy-sshd/gradle.properties +++ b/groovy-sshd/gradle.properties @@ -1 +1 @@ -version = 5.0.0 +version = 4.0.22.0 diff --git a/settings.gradle b/settings.gradle index 5ffa2a6..1106b7e 100644 --- a/settings.gradle +++ b/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-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('files-ftp-fs', 'org.xbib', 'files-ftp-fs').version('4.8.0') + library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.8.0') + 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') }