update to OpenJDK 21, Gradle 8.5

build.gradle

@@ -1,13 +1,8 @@
 
 plugins {
-    id "checkstyle"
-    id "pmd"
     id 'maven-publish'
     id 'signing'
-    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0-rc-1"
-    id "com.github.spotbugs" version "5.0.14"
-    id "org.cyclonedx.bom" version "1.7.2"
-    id "org.xbib.gradle.plugin.asciidoctor" version "2.5.2.2"
 }
 
 wrapper {
@@ -31,11 +26,9 @@ ext {
 }
 
 subprojects {
-    apply from: rootProject.file('gradle/ide/idea.gradle')
     apply from: rootProject.file('gradle/compile/java.gradle')
     apply from: rootProject.file('gradle/test/junit5.gradle')
-    apply from: rootProject.file('gradle/repositories/maven.gradle')
     apply from: rootProject.file('gradle/publish/maven.gradle')
 }
-apply from: rootProject.file('gradle/publish/forgejo.gradle')
 apply from: rootProject.file('gradle/publish/sonatype.gradle')
+apply from: rootProject.file('gradle/publish/forgejo.gradle')

gradle.properties

@@ -1,5 +1,3 @@
 group = org.xbib.groovy
 name = groovy-extensions
-version = 4.0.12.0
+version = 5.0.0
-
-org.gradle.warning.mode = ALL

gradle/compile/groovy-dynamic-tests.gradle

@@ -6,14 +6,10 @@ dependencies {
 }
 
 compileGroovy {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
     groovyOptions.configurationScript = rootProject.file('gradle/compile/groovyc.groovy')
 }
 
 compileTestGroovy {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType(GroovyCompile) {

gradle/compile/groovy-dynamic.gradle

@@ -6,13 +6,9 @@ dependencies {
 }
 
 compileGroovy {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileTestGroovy {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType(GroovyCompile) {

gradle/compile/groovy.gradle

@@ -6,14 +6,10 @@ dependencies {
 }
 
 compileGroovy {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
     groovyOptions.configurationScript = rootProject.file('gradle/compile/groovyc.groovy')
 }
 
 compileTestGroovy {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
     groovyOptions.configurationScript = rootProject.file('gradle/compile/groovyc.groovy')
 }
 

gradle/compile/java.gradle

@@ -2,31 +2,34 @@
 apply plugin: 'java-library'
 
 java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
     modularity.inferModulePath.set(true)
     withSourcesJar()
     withJavadocJar()
 }
 
-compileJava {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 jar {
     manifest {
         attributes('Implementation-Version': project.version)
+        attributes('X-Java-Compiler-Version': JavaLanguageVersion.of(21).toString())
     }
 }
 
 tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:all,-fallthrough'
+    options.fork = true
+    options.forkOptions.jvmArgs += [
+            '-Duser.language=en',
+            '-Duser.country=US',
+    ]
+    options.compilerArgs += [
+            '-Xlint:all'
+    ]
+    options.encoding = 'UTF-8'
 }
 
-javadoc {
+tasks.withType(Javadoc) {
     options.addStringOption('Xdoclint:none', '-quiet')
+    options.encoding = 'UTF-8'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

groovy-crypt/gradle.properties

@@ -1 +1 @@
-version = 4.0.0
+version = 5.0.0

groovy-ftp/gradle.properties

@@ -1 +1 @@
-version = 4.0.0
+version = 5.0.0

groovy-ftps/gradle.properties

@@ -1 +1 @@
-version = 4.0.0
+version = 5.0.0

groovy-git/gradle.properties

@@ -1 +1 @@
-version = 4.0.0
+version = 5.0.0

groovy-ldap/gradle.properties

@@ -1 +1 @@
-version = 4.0.0
+version = 5.0.0

groovy-mail/gradle.properties

@@ -1 +1 @@
-version = 4.0.0
+version = 5.0.0

groovy-sshd/gradle.properties

@@ -1 +1 @@
-version = 4.0.0
+version = 5.0.0

groovy-sshd/src/test/groovy/org/xbib/groovy/sshd/SFTPTest.groovy

@@ -2,19 +2,13 @@ package org.xbib.groovy.sshd
 
 import groovy.util.logging.Log
 import org.junit.jupiter.api.Test
-import org.xbib.io.sshd.eddsa.EdDSASecurityProvider
 
 import java.nio.file.Files
 import java.nio.file.Path
-import java.security.Security
 
 @Log
 class SFTPTest {
 
-    static {
-        Security.addProvider(new EdDSASecurityProvider())
-    }
-
     @Test
     void testSFTP() {
         SFTP sftp = SFTP.newInstance("sftp://demo.wftpserver.com:2222",[username: 'demo', password: 'demo'.toCharArray()])

settings.gradle

@@ -1,11 +1,24 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral {
+            metadataSources {
+                mavenPom()
+                artifact()
+                ignoreGradleMetadataRedirection()
+            }
+        }
+        gradlePluginPortal()
+    }
+}
 
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '8.1.1')
+            version('gradle', '8.5')
-            version('groovy', '4.0.12')
+            version('groovy', '4.0.17')
-            version('spock', '2.2-M1-groovy-4.0')
+            version('spock', '2.3-groovy-4.0')
-            version('junit', '5.9.3')
+            version('junit', '5.10.1')
             library('groovy-core', 'org.apache.groovy', 'groovy').versionRef('groovy')
             library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
             library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock')
@@ -15,8 +28,8 @@ dependencyResolutionManagement {
             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('3.0.0')
+            library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.2.1')
-            library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.2.0.202206071550-r')
+            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')
         }
     }