diff --git a/build.gradle b/build.gradle index 9ae6826..adc7c3e 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 { @@ -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 aa04a27..2542376 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,3 @@ group = org.xbib.groovy name = groovy-extensions - -# version reflects the groovy version plus a patch level version -version = 3.0.17.0 +version = 3.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/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-crypt/gradle.properties b/groovy-crypt/gradle.properties new file mode 100644 index 0000000..046039d --- /dev/null +++ b/groovy-crypt/gradle.properties @@ -0,0 +1 @@ +version = 3.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 new file mode 100644 index 0000000..046039d --- /dev/null +++ b/groovy-ftp/gradle.properties @@ -0,0 +1 @@ +version = 3.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 new file mode 100644 index 0000000..046039d --- /dev/null +++ b/groovy-ftps/gradle.properties @@ -0,0 +1 @@ +version = 3.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-annotations/gradle.properties b/groovy-git-annotations/gradle.properties new file mode 100644 index 0000000..046039d --- /dev/null +++ b/groovy-git-annotations/gradle.properties @@ -0,0 +1 @@ +version = 3.0.22.0 diff --git a/groovy-git/gradle.properties b/groovy-git/gradle.properties new file mode 100644 index 0000000..046039d --- /dev/null +++ b/groovy-git/gradle.properties @@ -0,0 +1 @@ +version = 3.0.22.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 0d1d327..75c3c4d 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 @@ -24,6 +24,7 @@ class TagRemoveOp implements Callable> { this.repo = repo } + @Override List call() { DeleteTagCommand cmd = repo.jgit.tagDelete() cmd.tags = names.collect { new ResolveService(repo).toTagName(it) } as String[] diff --git a/groovy-ldap/gradle.properties b/groovy-ldap/gradle.properties new file mode 100644 index 0000000..046039d --- /dev/null +++ b/groovy-ldap/gradle.properties @@ -0,0 +1 @@ +version = 3.0.22.0 diff --git a/groovy-mail/gradle.properties b/groovy-mail/gradle.properties new file mode 100644 index 0000000..046039d --- /dev/null +++ b/groovy-mail/gradle.properties @@ -0,0 +1 @@ +version = 3.0.22.0 diff --git a/groovy-sshd/gradle.properties b/groovy-sshd/gradle.properties new file mode 100644 index 0000000..046039d --- /dev/null +++ b/groovy-sshd/gradle.properties @@ -0,0 +1 @@ +version = 3.0.22.0 diff --git a/settings.gradle b/settings.gradle index c4c363a..8231806 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,20 +15,22 @@ pluginManagement { dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '8.5') - version('groovy', '3.0.17') + version('gradle', '8.7') + version('groovy', '3.0.22') 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('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 { - version('junit', '5.10.1') + version('junit', '5.10.2') 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('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') library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock') @@ -40,8 +42,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'