From b5c40767104e9fc1689f18893de710441194cd2d Mon Sep 17 00:00:00 2001
From: senmiaoliu <senmiaoliu@trip.com>
Date: Tue, 5 Sep 2023 11:47:58 +0800
Subject: [PATCH 1/2] bump testcontainers 0.41.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2e03256e09c..948e94d4194 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
         <sqlite.version>3.42.0.0</sqlite.version>
         <swagger.version>2.2.1</swagger.version>
         <swagger-ui.version>4.9.1</swagger-ui.version>
-        <testcontainers-scala.version>0.40.12</testcontainers-scala.version>
+        <testcontainers-scala.version>0.41.0</testcontainers-scala.version>
         <!-- https://github.com/ThreeTen/threeten-extra/issues/226 -->
         <threeten.version>1.7.0</threeten.version>
         <thrift.version>0.9.3</thrift.version>

From 878ffa07b7ddc01657e120d0d993c087e90ad435 Mon Sep 17 00:00:00 2001
From: senmiaoliu <senmiaoliu@trip.com>
Date: Tue, 5 Sep 2023 18:31:41 +0800
Subject: [PATCH 2/2] resolve maven conflict

---
 kyuubi-server/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kyuubi-server/pom.xml b/kyuubi-server/pom.xml
index a8b133d2792..42e54d0cc78 100644
--- a/kyuubi-server/pom.xml
+++ b/kyuubi-server/pom.xml
@@ -506,6 +506,12 @@
             <groupId>io.etcd</groupId>
             <artifactId>jetcd-launcher</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.testcontainers</groupId>
+                    <artifactId>testcontainers</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>