From 53f9cc8c67ace9018e0481342b7f7d32fe0074c1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 06 五月 2025 11:57:24 +0800
Subject: [PATCH] ld分支

---
 pom.xml |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 419cfcb..a81794a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.8.5</version>
+    <version>3.8.9</version>
     <packaging>jar</packaging>
 
     <name>ruoyi</name>
@@ -24,18 +24,22 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <pagehelper.spring.boot.starter.version>1.4.6</pagehelper.spring.boot.starter.version>
-        <fastjson.version>2.0.25</fastjson.version>
-        <druid.version>1.2.16</druid.version>
-        <commons.io.version>2.11.0</commons.io.version>
-        <commons.collections.version>3.2.2</commons.collections.version>
+        <pagehelper.spring.boot.starter.version>1.4.7</pagehelper.spring.boot.starter.version>
+        <fastjson.version>2.0.53</fastjson.version>
+        <druid.version>1.2.23</druid.version>
+        <commons.io.version>2.13.0</commons.io.version>
         <bitwalker.version>1.21</bitwalker.version>
         <jwt.version>0.9.1</jwt.version>
         <kaptcha.version>2.3.3</kaptcha.version>
         <swagger.version>3.0.0</swagger.version>
         <poi.version>4.1.2</poi.version>
-        <oshi.version>6.4.0</oshi.version>
+        <oshi.version>6.6.5</oshi.version>
         <velocity.version>2.3</velocity.version>
+        <!-- override dependency version -->
+        <tomcat.version>9.0.102</tomcat.version>
+        <logback.version>1.2.13</logback.version>
+        <spring-security.version>5.7.12</spring-security.version>
+        <spring-framework.version>5.3.39</spring-framework.version>
     </properties>
 
     <dependencies>
@@ -204,13 +208,6 @@
             <version>${velocity.version}</version>
         </dependency>
 
-        <!-- collections宸ュ叿绫� -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commons.collections.version}</version>
-        </dependency>
-
         <!-- 瀹氭椂浠诲姟 -->
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
@@ -230,7 +227,7 @@
             <version>${kaptcha.version}</version>
             <exclusions>
                 <exclusion>
-                    <artifactId>javax.servlet-api</artifactId>
+                    <artifactId>servlet-api</artifactId>
                     <groupId>javax.servlet</groupId>
                 </exclusion>
             </exclusions>

--
Gitblit v1.9.3