Build : Update to micronaut 5

buildSrc/src/main/groovy/io.micronaut.build.internal.redis-native-tests.gradle

@@ -1,7 +1,6 @@
 plugins {
     id "io.micronaut.build.internal.redis-base"
     id "io.micronaut.application"
-    id "io.micronaut.test-resources"
 }
 
 tasks.named("test") {

gradle/libs.versions.toml

@@ -1,19 +1,14 @@
 [versions]
-managed-lettuce = "6.7.1.RELEASE"
-
-micronaut-docs = "3.0.0"
-micronaut = "4.10.12"
-micronaut-test = "4.9.0"
-micronaut-cache = "5.3.0"
+managed-lettuce = "7.2.0.RELEASE"
+micronaut = "5.0.0-M6"
+micronaut-test = "5.0.0-M3"
+micronaut-cache = "6.0.0-M1"
 micronaut-micrometer = "5.13.2"
-micronaut-serde = "2.16.2"
+micronaut-serde = "3.0.0-M1"
 micronaut-logging = "1.7.1"
-micronaut-session = "4.8.0"
-micronaut-test-resources = "2.10.1"
+micronaut-session = "5.0.0-M1"
 micronaut-gradle-plugin = "4.6.1"
-
-groovy = "4.0.23"
-spock = "2.3-groovy-4.0"
+testcontainers-redis = "1.6.4"
 
 [libraries]
 micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'micronaut' }
@@ -22,7 +17,9 @@ micronaut-cache = { module = "io.micronaut.cache:micronaut-cache-bom", version.r
 micronaut-micrometer = { module = "io.micronaut.micrometer:micronaut-micrometer-bom", version.ref = "micronaut-micrometer" }
 micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serde" }
 micronaut-session = { module = "io.micronaut.session:micronaut-session-bom", version.ref = "micronaut-session" }
-micronaut-test-resources = { module = "io.micronaut.testresources:micronaut-test-resources-bom", version.ref = "micronaut-test-resources" }
 
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
 gradle-micronaut = { module = "io.micronaut.gradle:micronaut-gradle-plugin", version.ref = "micronaut-gradle-plugin" }
+
+testcontainers = { module = "org.testcontainers:testcontainers" }
+testcontainers-redis = { module = "com.redis.testcontainers:testcontainers-redis", version.ref = "testcontainers-redis" }

redis-lettuce/build.gradle

@@ -11,9 +11,10 @@ dependencies {
     compileOnly mnSession.micronaut.session
     compileOnly mn.micronaut.management
     compileOnly mnMicrometer.micronaut.micrometer.core
-    
+
     testAnnotationProcessor mn.micronaut.inject.java
-    testImplementation(mnTestResources.testcontainers.core)
+    testImplementation(platform(mnTest.boms.testcontainers))
+    testImplementation(libs.testcontainers)
 
     testImplementation mn.reactor
 
@@ -31,3 +32,9 @@ dependencies {
     testRuntimeOnly(mnLogging.logback.classic)
     testImplementation mn.snakeyaml
 }
+
+micronautBuild {
+    descriptor {
+        parentModuleId = "io.micronaut.redis:micronaut-redis-lettuce"
+    }
+}

settings.gradle

@@ -14,6 +14,7 @@ rootProject.name = 'redis-parent'
 include 'redis-bom'
 include 'redis-lettuce'
 include 'test-suite-graal'
+include 'test-suite-utils'
 
 micronautBuild {
     useStandardizedProjectNames = true
@@ -22,5 +23,4 @@ micronautBuild {
     importMicronautCatalog("micronaut-micrometer")
     importMicronautCatalog("micronaut-serde")
     importMicronautCatalog("micronaut-session")
-    importMicronautCatalog("micronaut-test-resources")
 }

test-suite-graal/build.gradle

@@ -22,6 +22,7 @@ dependencies {
     implementation mn.micronaut.context
     implementation mn.micronaut.jackson.databind
     implementation project(':micronaut-redis-lettuce')
+    testImplementation(project(':test-suite-utils'))
     implementation mn.snakeyaml
     runtimeOnly mnLogging.logback.classic
     testRuntimeOnly(libs.junit.platform.launcher)

test-suite-graal/src/test/java/example/RedisTest.java

@@ -1,12 +1,20 @@
 package example;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.redis.testcontainers.Redis;
+import io.micronaut.test.support.TestPropertyProvider;
 import org.junit.jupiter.api.Test;
 
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import org.junit.jupiter.api.TestInstance;
+
+import java.util.Map;
 
 @MicronautTest
-class RedisTest {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class RedisTest implements TestPropertyProvider {
 
     @Test
     void testRedis(RedisController controller) {
@@ -15,5 +23,9 @@ void testRedis(RedisController controller) {
         controller.keyCommandSet();
         assertEquals("Hello World", controller.keyCommandGet());
     }
-
-}
+
+    @Override
+    public @NonNull Map<String, String> getProperties() {
+        return Redis.getProperties();
+    }
+}

test-suite-utils/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("io.micronaut.build.internal.java-base")
+    `java-library`
+}
+dependencies {
+    implementation(platform(mnTest.boms.testcontainers))
+    api(libs.testcontainers)
+    api(libs.testcontainers.redis)
+}

test-suite-utils/src/main/java/io/micronaut/redis/testcontainers/Redis.java

@@ -0,0 +1,39 @@
+package io.micronaut.redis.testcontainers;
+
+import com.redis.testcontainers.RedisContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.Map;
+
+public class Redis {
+    private static final String REDIS_URI = "redis.uri";
+    private static final String IMAGE_NAME = RedisContainer.DEFAULT_IMAGE_NAME.asCanonicalNameString();
+    private static RedisContainer container;
+
+    public static RedisContainer getContainer() {
+        if (container == null) {
+            container = new RedisContainer(DockerImageName.parse(IMAGE_NAME));
+            container.start();
+            do {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            } while(!container.isRunning());
+            return container;
+        } else {
+            return container;
+        }
+    }
+
+    public static Map<String, String> getProperties() {
+        return getProperties(getContainer());
+    }
+
+    private static Map<String, String> getProperties(RedisContainer container) {
+        return Map.of(
+            REDIS_URI, container.getRedisURI()
+        );
+    }
+}

test-suite-utils/src/main/resources/META-INF/native-image/io.micronaut.redis/micronaut-redis/native-image.properties

@@ -0,0 +1 @@
+Args =--initialize-at-build-time=org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger