From ff6f2499f54a1bfa75d686e93ee51b702362bd08 Mon Sep 17 00:00:00 2001
From: Yuxuan HU <lydiahu_hn@hotmail.com>
Date: Fri, 13 Feb 2026 15:18:12 +1100
Subject: [PATCH 1/6] update testcontainers version to 2.0.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f401a87..adb05a3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,8 +117,8 @@
 			</dependency>
 			<dependency>
 				<groupId>org.testcontainers</groupId>
-				<artifactId>elasticsearch</artifactId>
-				<version>1.21.3</version>
+				<artifactId>testcontainers-elasticsearch</artifactId>
+				<version>2.0.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

From dfcad149a213acb49fd769f69e7862bbd41a834a Mon Sep 17 00:00:00 2001
From: Yuxuan HU <lydiahu_hn@hotmail.com>
Date: Fri, 13 Feb 2026 15:46:39 +1100
Subject: [PATCH 2/6] update testcontainers version to 1.21.4

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index adb05a3d..a27f0053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,12 +115,12 @@
 				<artifactId>jackson-databind-nullable</artifactId>
 				<version>0.2.6</version>
 			</dependency>
+			<!-- Source: https://mvnrepository.com/artifact/org.testcontainers/elasticsearch -->
 			<dependency>
 				<groupId>org.testcontainers</groupId>
-				<artifactId>testcontainers-elasticsearch</artifactId>
-				<version>2.0.2</version>
-				<type>pom</type>
-				<scope>import</scope>
+				<artifactId>elasticsearch</artifactId>
+				<version>1.21.4</version>
+				<scope>test</scope>
 			</dependency>
             <!-- EhCache 3.x -->
             <dependency>

From c0b858692b6cf036308b26a4fc61e0b3a1aa8d64 Mon Sep 17 00:00:00 2001
From: Yuxuan HU <lydiahu_hn@hotmail.com>
Date: Fri, 13 Feb 2026 15:51:42 +1100
Subject: [PATCH 3/6] specify DOCKER_API_VERSION

---
 .github/workflows/build_deploy_edge.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build_deploy_edge.yml b/.github/workflows/build_deploy_edge.yml
index 1681d91a..6135784b 100644
--- a/.github/workflows/build_deploy_edge.yml
+++ b/.github/workflows/build_deploy_edge.yml
@@ -46,6 +46,8 @@ jobs:
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}
 
       - name: Build with Maven
+        env:
+          DOCKER_API_VERSION: 1.44
         run: mvn -B verify --file pom.xml
 
       - name: Login to ECR

From c3e43fab481751d1e155d1c0b921f2d3b7ce2d8c Mon Sep 17 00:00:00 2001
From: Yuxuan HU <lydiahu_hn@hotmail.com>
Date: Fri, 13 Feb 2026 15:58:13 +1100
Subject: [PATCH 4/6] testcontainers to version 2.0.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a27f0053..e01038cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,8 +118,8 @@
 			<!-- Source: https://mvnrepository.com/artifact/org.testcontainers/elasticsearch -->
 			<dependency>
 				<groupId>org.testcontainers</groupId>
-				<artifactId>elasticsearch</artifactId>
-				<version>1.21.4</version>
+				<artifactId>testcontainers-elasticsearch</artifactId>
+				<version>2.0.2</version>
 				<scope>test</scope>
 			</dependency>
             <!-- EhCache 3.x -->

From 27f4a1614436c4faf7d92091eb2af67a505c5fe9 Mon Sep 17 00:00:00 2001
From: Yuxuan HU <lydiahu_hn@hotmail.com>
Date: Fri, 13 Feb 2026 16:10:12 +1100
Subject: [PATCH 5/6] minor change

---
 .github/workflows/build_deploy_edge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_deploy_edge.yml b/.github/workflows/build_deploy_edge.yml
index 6135784b..f5dd323e 100644
--- a/.github/workflows/build_deploy_edge.yml
+++ b/.github/workflows/build_deploy_edge.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Build with Maven
         env:
-          DOCKER_API_VERSION: 1.44
+          DOCKER_API_VERSION: '1.44'
         run: mvn -B verify --file pom.xml
 
       - name: Login to ECR

From 8ff4cb83f16ed83c9bb65d00878d8f6e4180164b Mon Sep 17 00:00:00 2001
From: Yuxuan HU <lydiahu_hn@hotmail.com>
Date: Fri, 13 Feb 2026 16:15:28 +1100
Subject: [PATCH 6/6] minor change

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 510aa52f..ace1da4f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,6 +42,8 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
+        env:
+          DOCKER_API_VERSION: '1.44'
         run: mvn clean -B verify --file pom.xml
 
       - name: Build Docker Image