joerg/groovy-extensions
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update dependencies, update to Gradle 8.7

Browse source
This commit is contained in:
Jörg Prante 2024-07-23 16:48:56 +02:00
parent 55e95251cf
commit 4f72933364
22 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.gradle
View file

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

4
gradle.properties
View file

@ -1,5 +1,3 @@
group = org.xbib.groovy group = org.xbib.groovy
name = groovy-extensions name = groovy-extensions
version = 3.0.22.0
# version reflects the groovy version plus a patch level version
version = 3.0.17.0

1
gradle/compile/java.gradle
View file

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

2
gradle/test/junit5.gradle
View file

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

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

20
gradlew.bat vendored
View file

@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail

1
groovy-crypt/gradle.properties Normal file
View file

@ -0,0 +1 @@
version = 3.0.22.0

2
groovy-ftp/build.gradle
View file

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

1
groovy-ftp/gradle.properties Normal file
View file

@ -0,0 +1 @@
version = 3.0.22.0

6
groovy-ftp/src/main/java/org/xbib/groovy/ftp/FTPContext.java
View file

@ -1,15 +1,13 @@
package org.xbib.groovy.ftp; 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.io.IOException;
import java.net.URI; import java.net.URI;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;
import java.util.Map; import java.util.Map;
/**
*/
class FTPContext { class FTPContext {
final FTPFileSystemProvider provider; final FTPFileSystemProvider provider;

2
groovy-ftps/build.gradle
View file

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

1
groovy-ftps/gradle.properties Normal file
View file

@ -0,0 +1 @@
version = 3.0.22.0

7
groovy-ftps/src/main/java/org/xbib/groovy/ftps/FTPSContext.java
View file

@ -1,7 +1,8 @@
package org.xbib.groovy.ftps; 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.io.IOException;
import java.net.URI; import java.net.URI;
import java.nio.file.FileSystem; import java.nio.file.FileSystem;
@ -15,7 +16,7 @@ public class FTPSContext {
FTPSContext(URI uri, Map<String, ?> env) throws IOException { FTPSContext(URI uri, Map<String, ?> env) throws IOException {
this.provider = new FTPSFileSystemProvider(); 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 { void close() throws IOException {

3
groovy-ftps/src/test/java/org/xbib/groovy/ftps/FTPSTest.groovy
View file

@ -1,8 +1,7 @@
package org.xbib.groovy.ftps package org.xbib.groovy.ftps
import groovy.util.logging.Log 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.Files
import java.nio.file.Path import java.nio.file.Path

1
groovy-git-annotations/gradle.properties Normal file
View file

@ -0,0 +1 @@
version = 3.0.22.0

1
groovy-git/gradle.properties Normal file
View file

@ -0,0 +1 @@
version = 3.0.22.0

1
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/TagRemoveOp.groovy
View file

@ -24,6 +24,7 @@ class TagRemoveOp implements Callable<List<String>> {
this.repo = repo this.repo = repo
} }
@Override
List<String> call() { List<String> call() {
DeleteTagCommand cmd = repo.jgit.tagDelete() DeleteTagCommand cmd = repo.jgit.tagDelete()
cmd.tags = names.collect { new ResolveService(repo).toTagName(it) } as String[] cmd.tags = names.collect { new ResolveService(repo).toTagName(it) } as String[]

1
groovy-ldap/gradle.properties Normal file
View file

@ -0,0 +1 @@
version = 3.0.22.0

1
groovy-mail/gradle.properties Normal file
View file

@ -0,0 +1 @@
version = 3.0.22.0

1
groovy-sshd/gradle.properties Normal file
View file

@ -0,0 +1 @@
version = 3.0.22.0

16
settings.gradle
View file

@ -15,20 +15,22 @@ pluginManagement {
dependencyResolutionManagement { dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
libs { libs {
version('gradle', '8.5') version('gradle', '8.7')
version('groovy', '3.0.17') version('groovy', '3.0.22')
library('groovy-core', 'org.codehaus.groovy', 'groovy').versionRef('groovy') library('groovy-core', 'org.codehaus.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.2.1') library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.8.0')
library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.8.0.202311291450-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') library('mail', 'com.sun.mail', 'javax.mail').version('1.6.2')
} }
testLibs { testLibs {
version('junit', '5.10.1') version('junit', '5.10.2')
version('spock', '2.3-groovy-3.0') version('spock', '2.3-groovy-3.0')
library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') 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-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').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('junit4', 'junit', 'junit').version('4.13.2')
library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock') library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
@ -40,8 +42,8 @@ dependencyResolutionManagement {
include 'groovy-crypt' include 'groovy-crypt'
include 'groovy-ftp' include 'groovy-ftp'
include 'groovy-ftps' include 'groovy-ftps'
include 'groovy-git-annotations'
include 'groovy-git' include 'groovy-git'
include 'groovy-git-annotations'
include 'groovy-ldap' include 'groovy-ldap'
include 'groovy-mail' include 'groovy-mail'
include 'groovy-sshd' include 'groovy-sshd'