build: Upgraded to gradle 8.4

Author: jruaux

.github/workflows/release.yml

@@ -18,6 +18,7 @@ jobs:
     with:
       branch: ${{ github.event.inputs.branch }}
       version: ${{ github.event.inputs.version }}
+      java-version: 21
     secrets:
       github-token: ${{ secrets.GIT_ACCESS_TOKEN }}
       gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}

VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0-SNAPSHOT

build.gradle

@@ -6,15 +6,15 @@ config {
         tags = ['redis', 'enterprise', 'admin']
 
         links {
-            website      = "https://github.com/redis-developer/${project.rootProject.name}"
-            issueTracker = "https://github.com/redis-developer/${project.rootProject.name}/issues"
-            scm          = "https://github.com/redis-developer/${project.rootProject.name}.git"
+            website      = "https://github.com/redis-field-engineering/${project.rootProject.name}"
+            issueTracker = "https://github.com/redis-field-engineering/${project.rootProject.name}/issues"
+            scm          = "https://github.com/redis-field-engineering/${project.rootProject.name}.git"
         }
 
         scm {
-            url                 = "https://github.com/redis-developer/${project.rootProject.name}"
-            connection          = "scm:git:https://github.com/redis-developer/${project.rootProject.name}.git"
-            developerConnection = "scm:git:git@github.com:redis-developer/${project.rootProject.name}.git"
+            url                 = "https://github.com/redis-field-engineering/${project.rootProject.name}"
+            connection          = "scm:git:https://github.com/redis-field-engineering/${project.rootProject.name}.git"
+            developerConnection = "scm:git:git@github.com:redis-field-engineering/${project.rootProject.name}.git"
         }
 
         specification {
@@ -40,18 +40,10 @@ config {
                 enabled = false
             }
         }
-        sourceHtml {
-            enabled = false
-        }
     }
 
     licensing {
         enabled = false
-        licenses {
-            license {
-                id = 'Apache-2.0'
-            }
-        }
     }
 
     coverage {
@@ -97,28 +89,7 @@ subprojects {
         useJUnitPlatform()
     }
 
-    bootJar {
-        enabled = false
-    }
-
-    jar {
-        enabled = true
-        archiveClassifier = ''
-    }
-
     compileJava {
         options.release = 8
     }
-    
-    configurations {
-        all*.exclude module: 'spring-boot-starter-logging'
-    }
-    
-    configurations.all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            if (details.requested.name == 'lettuce-core' ) {
-                details.useVersion lettuceVersion
-            }
-        }
-    }
-}
+}

gradle.properties

@@ -1,19 +1,26 @@
 group                      = com.redis
-sourceCompatibility        = 1.8
-targetCompatibility        = 1.8
+sourceCompatibility        = 8
+targetCompatibility        = 8
+testSourceCompatibility    = 11
+testTargetCompatibility    = 11
 reproducibleBuild          = true
 
-bootPluginVersion          = 2.7.10
-kordampBuildVersion        = 2.8.0
-kordampPluginVersion       = 0.48.0
+kordampBuildVersion        = 3.3.0
+kordampPluginVersion       = 0.53.0
 
 awaitilityVersion          = 4.2.0
-commonsIOVersion           = 2.11.0
-jacocoVersion              = 0.8.9
-lettuceVersion             = 6.2.3.RELEASE
-testcontainersRedisVersion = 1.6.3
+commonsIOVersion           = 2.14.0
+httpclientVersion          = 5.2.1
+jacksonVersion             = 2.15.3
+jacocoVersion              = 0.8.10
+junitVersion               = 5.10.1
+junitPlatformVersion       = 1.10.0
+lettucemodVersion          = 3.7.3
+slf4jVersion               = 1.7.36
+testcontainersVersion      = 1.19.2
+testcontainersRedisVersion = 1.7.0
 
 org.gradle.daemon          = true
-org.gradle.caching         = true
+org.gradle.caching         = false
 systemProp.file.encoding   = utf-8
 org.gradle.jvmargs         = -Dfile.encoding=UTF-8

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -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
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # 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
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# 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" \

gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

gradlew.bat

@@ -8,7 +8,6 @@ buildscript {
         classpath "org.kordamp.gradle:java-project-gradle-plugin:$kordampPluginVersion"
         classpath "org.kordamp.gradle:jacoco-gradle-plugin:$kordampPluginVersion"
         classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion"
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"
     }
 }
 
@@ -26,14 +25,25 @@ projects {
         path(':') {
             id 'org.kordamp.gradle.java-project'
         }
-        dirs(['subprojects']) {
+        dir('subprojects') {
             id 'java-library'
-            id 'org.springframework.boot'
-            id 'io.spring.dependency-management'
         }
     }
 }
 
 enforce {
-    enabled = false
+    rule(enforcer.rules.ForceDependencies) { r ->
+        r.dependencies.addAll "org.slf4j:slf4j-api:$slf4jVersion",
+            "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion",
+            "com.fasterxml.jackson.core:jackson-bom:$jacksonVersion",
+            "com.fasterxml.jackson.core:jackson-core:$jacksonVersion",
+            "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
+            "commons-io:commons-io:$commonsIOVersion",
+            "org.apache.httpcomponents.client5:httpclient5:$httpclientVersion",
+            "org.junit:junit-bom:$junitVersion",
+            "org.junit.platform:junit-platform-engine:$junitPlatformVersion",
+            "org.junit.platform:junit-platform-commons:$junitPlatformVersion",
+            "org.junit.platform:junit-platform-launcher:$junitPlatformVersion",
+            "org.testcontainers:testcontainers:$testcontainersVersion"
+    }
 }

settings.gradle

@@ -1,11 +1,17 @@
 dependencies {
     implementation group: 'commons-io', name: 'commons-io', version: commonsIOVersion
-    implementation 'com.fasterxml.jackson.core:jackson-databind'
-    implementation 'org.apache.httpcomponents.client5:httpclient5'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
+    implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: httpclientVersion
     implementation group: 'org.awaitility', name: 'awaitility', version: awaitilityVersion
-    testImplementation 'org.slf4j:slf4j-api'
-    testImplementation 'org.slf4j:slf4j-simple'
-    testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis-junit', version: testcontainersRedisVersion
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitVersion
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: junitVersion
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitVersion
+    testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: junitPlatformVersion
+    testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: testcontainersVersion
+    testImplementation(group: 'com.redis', name: 'testcontainers-redis', version: testcontainersRedisVersion) {
+        exclude group: 'com.redis', module: 'redis-enterprise-admin'
+    }
+    testImplementation group: 'com.redis', name: 'lettucemod', version: lettucemodVersion
 }
 
 eclipse {