Bumped dependencies and fixed warnings

Author: blootsvoets

Dockerfile

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM gradle:8.1-jdk17 AS builder
+FROM --platform=$BUILDPLATFORM gradle:8.3-jdk17 AS builder
 
 RUN mkdir /code
 WORKDIR /code

buildSrc/src/main/kotlin/Versions.kt

@@ -2,34 +2,34 @@ object Versions {
     const val project = "2.3.3-SNAPSHOT"
 
     const val java = 17
-    val kotlin = "1.8.21"
-    const val dockerCompose = "0.16.12"
+    const val kotlin = "1.9.10"
+    const val dockerCompose = "0.17.4"
 
-    const val radarCommons = "1.0.0"
-    const val radarSchemas = "0.8.3"
-    const val jackson = "2.15.0"
-    const val slf4j = "2.0.7"
+    const val radarCommons = "1.0.1-SNAPSHOT"
+    const val radarSchemas = "0.8.4"
+    const val jackson = "2.15.2"
+    const val slf4j = "2.0.9"
     const val log4j2 = "2.20.0"
-    const val avro = "1.11.1"
+    const val avro = "1.11.2"
 
-    const val mockitoKotlin = "4.1.0"
+    const val mockitoKotlin = "5.1.0"
     const val hamcrest = "2.2"
 
-    const val wrapper = "8.1.1"
+    const val wrapper = "8.3"
 
     const val managementPortal = "2.0.1-SNAPSHOT"
-    const val coroutines = "1.7.1"
-    const val snappy = "1.1.9.1"
+    const val coroutines = "1.7.3"
+    const val snappy = "1.1.10.3"
     const val jCommander = "1.82"
     const val almworks = "1.1.2"
-    const val minio = "8.5.2"
+    const val minio = "8.5.5"
     const val guava = "31.1-jre"
-    const val opencsv = "5.7.1"
+    const val opencsv = "5.8"
     const val okhttp = "4.11.0"
-    const val jedis = "4.4.0"
-    const val azureStorage = "12.22.0"
-    const val netty = "4.1.92.Final"
-    const val snakeYaml = "1.33"
+    const val jedis = "5.0.0"
+    const val azureStorage = "12.23.1"
+    const val netty = "4.1.97.Final"
+    const val snakeYaml = "2.2"
     const val apacheCommonsText = "1.10.0"
-    const val projectReactorNetty = "1.1.7"
+    const val projectReactorNetty = "1.1.10"
 }

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -130,10 +131,13 @@ 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.

gradlew

@@ -4,17 +4,6 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenCentral()
-        maven(url = "https://maven.pkg.github.com/radar-base/radar-commons") {
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                    ?: extra.properties["gpr.user"] as? String
-                    ?: extra.properties["public.gpr.user"] as? String
-                password = System.getenv("GITHUB_TOKEN")
-                    ?: extra.properties["gpr.token"] as? String
-                    ?: (extra.properties["public.gpr.token"] as? String)?.let {
-                        java.util.Base64.getDecoder().decode(it).decodeToString()
-                    }
-            }
-        }
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
     }
 }

settings.gradle.kts

@@ -14,7 +14,6 @@ import org.radarbase.output.util.objectBuild
 import java.nio.charset.StandardCharsets.UTF_8
 import java.nio.file.Paths
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class RestructureS3IntegrationTest {
     @Test
     fun integration() = runTest {

src/integrationTest/java/org/radarbase/output/RestructureS3IntegrationTest.kt

@@ -1,6 +1,5 @@
 package org.radarbase.output.accounting
 
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.*
@@ -14,7 +13,6 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import java.time.Instant
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class OffsetRangeRedisTest {
     private lateinit var testFile: Path
     private lateinit var redisHolder: RedisHolder

src/integrationTest/java/org/radarbase/output/accounting/OffsetRangeRedisTest.kt

@@ -1,6 +1,5 @@
 package org.radarbase.output.accounting
 
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.not
@@ -11,7 +10,6 @@ import org.junit.jupiter.api.Test
 import org.radarbase.output.util.SuspendedCloseable.Companion.useSuspended
 import redis.clients.jedis.JedisPool
 
-@OptIn(ExperimentalCoroutinesApi::class)
 internal class RedisRemoteLockManagerTest {
     private lateinit var redisHolder: RedisHolder
     private lateinit var lockManager1: RemoteLockManager

src/integrationTest/java/org/radarbase/output/accounting/RedisRemoteLockManagerTest.kt

@@ -21,7 +21,6 @@ interface Format {
 
     val extension: String
 
-    open fun matchesFilename(name: String): Boolean {
-        return name.lowercase().endsWith(extension.lowercase())
-    }
+    fun matchesFilename(name: String): Boolean =
+        name.endsWith(extension, ignoreCase = true)
 }