Compare commits
4 commits
Author | SHA1 | Date | |
---|---|---|---|
13bba1c0fc | |||
06d51cf801 | |||
634e55b8fd | |||
a843989166 |
21 changed files with 52 additions and 48 deletions
|
@ -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')
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
group = org.xbib.groovy
|
||||
name = groovy-extensions
|
||||
version = 5.0.0
|
||||
version = 4.0.22.0
|
||||
|
|
|
@ -5,7 +5,6 @@ java {
|
|||
toolchain {
|
||||
languageVersion = JavaLanguageVersion.of(21)
|
||||
}
|
||||
modularity.inferModulePath.set(true)
|
||||
withSourcesJar()
|
||||
withJavadocJar()
|
||||
}
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
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
|
||||
testRuntimeOnly testLibs.junit.jupiter.vintage
|
||||
testRuntimeOnly testLibs.junit.jupiter.platform.launcher
|
||||
}
|
||||
|
||||
test {
|
||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -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
|
||||
|
|
20
gradlew.bat
vendored
20
gradlew.bat
vendored
|
@ -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
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
version = 5.0.0
|
||||
version = 4.0.22.0
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
apply from: rootProject.file('gradle/compile/groovy.gradle')
|
||||
|
||||
dependencies {
|
||||
api libs.ftp.fs
|
||||
api libs.files.ftp.fs
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
version = 5.0.0
|
||||
version = 4.0.22.0
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
apply from: rootProject.file('gradle/compile/groovy.gradle')
|
||||
|
||||
dependencies {
|
||||
api libs.ftp.fs
|
||||
api libs.files.ftp.fs
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
version = 5.0.0
|
||||
version = 4.0.22.0
|
||||
|
|
|
@ -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<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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
version = 5.0.0
|
||||
version = 4.0.22.0
|
||||
|
|
|
@ -1 +1 @@
|
|||
version = 5.0.0
|
||||
version = 4.0.22.0
|
||||
|
|
|
@ -1 +1 @@
|
|||
version = 5.0.0
|
||||
version = 4.0.22.0
|
||||
|
|
|
@ -1 +1 @@
|
|||
version = 5.0.0
|
||||
version = 4.0.22.0
|
||||
|
|
|
@ -15,22 +15,26 @@ 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.22')
|
||||
library('groovy-core', 'org.apache.groovy', 'groovy').versionRef('groovy')
|
||||
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('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')
|
||||
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('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 +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'
|
||||
|
|
Loading…
Reference in a new issue