From 7cefe8596d99e39cb4098f646286ba1d6baff4c7 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Fri, 24 Jul 2026 09:37:28 -0700
Subject: [PATCH 1/3] Update Testcontainers dep 1.20.6 -> 1.21.4

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index d267d41a4..356fc5099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -491,13 +491,13 @@
     <dependency>
         <groupId>org.testcontainers</groupId>
         <artifactId>testcontainers</artifactId>
-        <version>1.20.6</version>
+        <version>1.21.4</version>
         <scope>test</scope>
     </dependency>
     <dependency>
         <groupId>org.testcontainers</groupId>
         <artifactId>junit-jupiter</artifactId>
-        <version>1.20.6</version>
+        <version>1.21.4</version>
         <scope>test</scope>
     </dependency>
     <dependency>
@@ -566,7 +566,7 @@
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
-    </dependency> 
+    </dependency>
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-mysql</artifactId>

From ecd43e520f78ae15f8d39fa53fb988e63b9fa142 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Fri, 24 Jul 2026 09:38:29 -0700
Subject: [PATCH 2/3] Reuse the same container instance across multiple test
 files

---
 .../org/wise/portal/junit/AbstractTransactionalDbTests.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/wise/portal/junit/AbstractTransactionalDbTests.java b/src/test/java/org/wise/portal/junit/AbstractTransactionalDbTests.java
index 8b8781ff0..6aab8cc3e 100644
--- a/src/test/java/org/wise/portal/junit/AbstractTransactionalDbTests.java
+++ b/src/test/java/org/wise/portal/junit/AbstractTransactionalDbTests.java
@@ -103,9 +103,13 @@ public abstract class AbstractTransactionalDbTests
   private Long nextAvailableProjectId = 1L;
 
   @Container
-  static GenericContainer redisContainer = new GenericContainer(
+  static final GenericContainer redisContainer = new GenericContainer(
       DockerImageName.parse("redis:7-alpine")).withExposedPorts(6379);
 
+  static {
+    redisContainer.start();
+  }
+
   @DynamicPropertySource
   static void redisProperties(DynamicPropertyRegistry registry) {
     String redisHost = redisContainer.getHost();

From c3abe8b0af91e2914443c3af754877940118aed5 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Fri, 24 Jul 2026 09:42:33 -0700
Subject: [PATCH 3/3] Upgrade Redis 7 -> 8

---
 .../org/wise/portal/junit/AbstractTransactionalDbTests.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/wise/portal/junit/AbstractTransactionalDbTests.java b/src/test/java/org/wise/portal/junit/AbstractTransactionalDbTests.java
index 6aab8cc3e..1b174d3a4 100644
--- a/src/test/java/org/wise/portal/junit/AbstractTransactionalDbTests.java
+++ b/src/test/java/org/wise/portal/junit/AbstractTransactionalDbTests.java
@@ -104,7 +104,7 @@ public abstract class AbstractTransactionalDbTests
 
   @Container
   static final GenericContainer redisContainer = new GenericContainer(
-      DockerImageName.parse("redis:7-alpine")).withExposedPorts(6379);
+      DockerImageName.parse("redis:8-alpine")).withExposedPorts(6379);
 
   static {
     redisContainer.start();