From 0c23e17d755277a7fdae9129fc0c0052945b1ae0 Mon Sep 17 00:00:00 2001
From: KomachiSion <xiweng.yy@alibaba-inc.com>
Date: Wed, 4 Sep 2024 15:27:43 +0800
Subject: [PATCH] Upgrade spring to 5.3.39 and tomcat to 9.0.93

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

diff --git a/pom.xml b/pom.xml
index 7389a2ab140..b29f57032ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,9 +149,12 @@
         <jraft-core.version>1.3.14</jraft-core.version>
         <rpc-grpc-impl.version>${jraft-core.version}</rpc-grpc-impl.version>
         <SnakeYaml.version>2.0</SnakeYaml.version>
-        <spring.version>5.3.38</spring.version>
-        <spring-security.version>5.7.12</spring-security.version>
         <junit5.version>5.10.2</junit5.version>
+        
+        <!-- override dependency version -->
+        <spring.version>5.3.39</spring.version>
+        <spring-security.version>5.7.12</spring-security.version>
+        <tomcat.version>9.0.93</tomcat.version>
     </properties>
     <!-- == -->
     <!-- =========================================================Build plugins================================================ -->
@@ -684,6 +687,42 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- override dependencies version due to spring boot 2 is not maintained-->
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-annotations-api</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jdbc</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jsp-api</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-core</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-el</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-jasper</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
             
             <!-- Internal libs -->
             <dependency>