Upgrades ongoing:

Upgrades:
- com.redis.om:redis-om-spring from 0.9.7 to 1.1.1
- org.springdoc:springdoc-openapi-starter-webmvc-ui from 2.8.8 to 2.8.14
- io.swagger.parser.v3:swagger-parser-v3 from 2.1.31 to 2.1.36
- org.testcontainers:postgresql from 1.20.6 to 1.21.3
- org.testcontainers:localstack from 1.20.6 to 1.21.3
- io.awspring.cloud:spring-cloud-aws-dependencies from 3.3.0 to 3.4.2
- io.awspring.cloud:spring-cloud-aws-starter-s3 from 3.3.0 to 3.4.2

Misc:
- replace BasicThreadFactory.Builder() by BasicThreadFactory.builder()
- replace InputStream.nullInputStream() in tests by " ".toByteArray() to avoid errors
- add constraint on com.redis.testcontainers:testcontainers-redis-junit to use com.redis:lettucemod:4.5.0 (compatibility)

Author: jreynard-code

api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt

@@ -44,7 +44,6 @@ import com.cosmotech.dataset.domain.DatasetSecurity
 import com.cosmotech.dataset.domain.DatasetUpdateRequest
 import com.cosmotech.solution.domain.RunTemplateCreateRequest
 import com.cosmotech.solution.domain.RunTemplateResourceSizing
-import java.io.InputStream
 import kotlin.test.assertEquals
 import org.apache.commons.io.IOUtils
 import org.hamcrest.Matchers.empty
@@ -1063,7 +1062,7 @@ class DatasetControllerTests : ControllerTestBase() {
             "file",
             "test.csv",
             MediaType.MULTIPART_FORM_DATA_VALUE,
-            InputStream.nullInputStream(),
+            " ".toByteArray(),
         )
 
     mvc.perform(

build.gradle.kts

@@ -65,22 +65,22 @@ val springSecurityJwtVersion = "1.1.1.RELEASE"
 val springOauthAutoConfigureVersion = "2.6.8"
 val kotlinJvmTarget = 21
 val cosmotechApiCommonVersion = "2.1.1-SNAPSHOT"
-val redisOmSpringVersion = "0.9.7"
+val redisOmSpringVersion = "1.1.1"
 val kotlinCoroutinesVersion = "1.10.2"
 val oktaSpringBootVersion = "3.0.7"
-val springDocVersion = "2.8.8"
-val swaggerParserVersion = "2.1.31"
+val springDocVersion = "2.8.14"
+val swaggerParserVersion = "2.1.36"
 val commonsCsvVersion = "1.14.0"
 val apiValidationVersion = "3.0.2"
 val kubernetesClientVersion = "22.0.0"
 val orgJsonVersion = "20240303"
 val jacksonModuleKotlinVersion = "2.18.3"
 val testNgVersion = "7.8.0"
 val testContainersRedisVersion = "1.6.4"
-val testContainersPostgreSQLVersion = "1.20.6"
-val testContainersLocalStackVersion = "1.20.6"
+val testContainersPostgreSQLVersion = "1.21.3"
+val testContainersLocalStackVersion = "1.21.3"
 val commonCompressVersion = "1.27.1"
-val awsSpringVersion = "3.3.0"
+val awsSpringVersion = "3.4.2"
 
 // Checks
 val detektVersion = "1.23.8"
@@ -132,7 +132,6 @@ allprojects {
     sourceCompatibility = JavaVersion.VERSION_21
     toolchain { languageVersion.set(JavaLanguageVersion.of(kotlinJvmTarget)) }
   }
-  configurations { all { resolutionStrategy { force("com.redis.om:redis-om-spring:0.9.10") } } }
 
   repositories {
     maven {
@@ -201,10 +200,13 @@ subprojects {
   val testWorkingDirPath = "${layout.buildDirectory.get()}/run"
 
   sourceSets {
-    create("integrationTest") {
-      compileClasspath += sourceSets.main.get().output + sourceSets.test.get().output
-      runtimeClasspath += sourceSets.main.get().output + sourceSets.test.get().output
-    }
+    create(
+        "integrationTest",
+        Action {
+          compileClasspath += sourceSets.main.get().output + sourceSets.test.get().output
+          runtimeClasspath += sourceSets.main.get().output + sourceSets.test.get().output
+        },
+    )
     if (openApiDefinitionFile.exists()) {
       main { java.srcDirs("$openApiServerSourcesGenerationDir/src/main/kotlin") }
       test { java.srcDirs("$openApiServerSourcesGenerationDir/src/test/kotlin") }

common/build.gradle.kts

@@ -17,7 +17,9 @@ dependencies {
   implementation("org.hashids:hashids:${hashidsVersion}")
   implementation(
       "com.redis.testcontainers:testcontainers-redis-junit:${testContainersRedisVersion}"
-  )
+  ) {
+    constraints { implementation("com.redis:lettucemod:4.5.0") }
+  }
   implementation("org.testcontainers:postgresql:${testContainersPostgreSQLVersion}")
   implementation("org.testcontainers:localstack:${testContainersLocalStackVersion}")
   implementation("org.apache.tika:tika-core:${tikaVersion}")

common/src/main/kotlin/com/cosmotech/common/config/CsmApiConfiguration.kt

@@ -36,7 +36,7 @@ open class CsmApiConfiguration {
   open fun inProcessEventHandlerExecutor(): Executor =
       // TODO A better strategy could be with a limited core pool size off an unbounded queue ?
       Executors.newCachedThreadPool(
-          BasicThreadFactory.Builder().namingPattern("csm-event-handler-%d").build()
+          BasicThreadFactory.builder().namingPattern("csm-event-handler-%d").build()
       )
 
   @Bean open fun yamlHttpMessageConverter(): YamlMessageConverter = YamlMessageConverter()

dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt

@@ -2533,15 +2533,15 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
             "files",
             CUSTOMER_SOURCE_FILE_NAME,
             MediaType.MULTIPART_FORM_DATA_VALUE,
-            InputStream.nullInputStream(),
+            " ".toByteArray(),
         )
 
     val emptyInventoryMockMultipartFile =
         MockMultipartFile(
             "files",
             INVENTORY_SOURCE_FILE_NAME,
             MediaType.MULTIPART_FORM_DATA_VALUE,
-            InputStream.nullInputStream(),
+            " ".toByteArray(),
         )
 
     val createdDataset =
@@ -2908,15 +2908,6 @@ class DatasetServiceIntegrationTest() : CsmTestBase() {
     val newDatasetDescription = "Dataset for shop"
     val newDatasetTags = mutableListOf("dataset", "public", "shop")
     val newDatasetAdditionalData = mutableMapOf<String, Any>("dataset" to "new data")
-    val newDatasetSecurity =
-        DatasetSecurity(
-            default = ROLE_NONE,
-            accessControlList =
-                mutableListOf(
-                    DatasetAccessControl(CONNECTED_ADMIN_USER, ROLE_ADMIN),
-                    DatasetAccessControl(CONNECTED_DEFAULT_USER, ROLE_EDITOR),
-                ),
-        )
     val datasetUpdateRequest =
         DatasetUpdateRequest(
             name = newDatasetName,