From d49d40fec162ef3f216044eeaacf203b48270e05 Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Thu, 30 Oct 2025 22:41:00 +0800
Subject: [PATCH] =?UTF-8?q?chore(deps):=20=E6=9B=B4=E6=96=B0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=20-=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=20undertow=20=E7=89=88=E6=9C=AC=E4=BB=8E=202.3.18.Fin?=
 =?UTF-8?q?al=20=E5=88=B02.3.20.Final=20-=20=E5=8D=87=E7=BA=A7=20mysql-con?=
 =?UTF-8?q?nector-j=20=E7=89=88=E6=9C=AC=E4=BB=8E9.3.0=20=E5=88=B0=209.4.0?=
 =?UTF-8?q?=20-=20=E5=8D=87=E7=BA=A7=20ip2region=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BB=8E=202.7.18.9=20=E5=88=B0=203.5.6=20-=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=20fastjson2=20=E7=89=88=E6=9C=AC=E4=BB=8E=202.0.59=20?=
 =?UTF-8?q?=E5=88=B02.0.60=20-=20=E9=99=8D=E7=BA=A7=20hutool=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=BB=8E=205.8.41=20=E5=88=B05.8.40=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E9=83=A8=E5=88=86=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=A1=AC=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98=EF=BC=8C=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8=E5=B1=9E=E6=80=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20-=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BB=A5=E5=8C=B9=E9=85=8D=E4=B8=BB?=
 =?UTF-8?q?=20pom.xml=20=E9=85=8D=E7=BD=AE=20-=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=BE=9D=E8=B5=96=20groupId=20=E4=BB=8E=20ja?=
 =?UTF-8?q?karta.mail=20=E5=88=B0=20javax.mail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cutejava-springboot3/pom.xml | 13 +++---
 cutejava/pom.xml             | 77 +++++++++++++-----------------------
 2 files changed, 34 insertions(+), 56 deletions(-)

diff --git a/cutejava-springboot3/pom.xml b/cutejava-springboot3/pom.xml
index 4c4fb80f..b1e807d9 100644
--- a/cutejava-springboot3/pom.xml
+++ b/cutejava-springboot3/pom.xml
@@ -37,13 +37,13 @@
         <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
         <jna.version>5.8.0</jna.version>
         <mail.version>2.1.5</mail.version>
-        <undertow.version>2.3.18.Final</undertow.version>
+        <undertow.version>2.3.20.Final</undertow.version>
         <freemarker.version>2.3.34</freemarker.version>
         <p6spy.version>3.9.1</p6spy.version>
         <knife4j.version>4.5.0</knife4j.version>
-        <mysql.version>9.3.0</mysql.version>
-        <ip2region.version>2.7.18.9</ip2region.version>
-        <aspectjrt.version>1.9.7</aspectjrt.version>
+        <mysql.version>9.4.0</mysql.version>
+        <ip2region.version>3.5.6</ip2region.version>
+        <springaop.version>1.9.7</springaop.version>
         <captcha.version>1.6.2</captcha.version>
         <commons-text.version>1.13.0</commons-text.version>
         <transmittable.version>2.14.5</transmittable.version>
@@ -214,13 +214,13 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>${aspectjrt.version}</version>
+            <version>${springaop.version}</version>
         </dependency>
         <!-- jvm启动参数 javaagent 支持 -->
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>${aspectjrt.version}</version>
+            <version>${springaop.version}</version>
         </dependency>
 
         <!-- lombok插件 -->
@@ -243,7 +243,6 @@
             <artifactId>fastjson2</artifactId>
             <version>${fastjson2.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2-extension-spring6</artifactId>
diff --git a/cutejava/pom.xml b/cutejava/pom.xml
index d2d46734..b6dc64b9 100644
--- a/cutejava/pom.xml
+++ b/cutejava/pom.xml
@@ -29,37 +29,15 @@
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <java.version>11</java.version>
         <logback.version>1.2.9</logback.version>
-        <fastjson2.version>2.0.59</fastjson2.version>
+        <fastjson2.version>2.0.60</fastjson2.version>
         <druid.version>1.2.27</druid.version>
         <commons-pool2.version>2.11.1</commons-pool2.version>
         <mybatis-plus.version>3.5.14</mybatis-plus.version>
-        <hutool.version>5.8.41</hutool.version>
+        <hutool.version>5.8.40</hutool.version>
         <jjwt.version>0.12.6</jjwt.version>
         <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
         <jna.version>5.8.0</jna.version>
-        <mail.version>2.1.5</mail.version>
-        <undertow.version>2.3.18.Final</undertow.version>
-        <freemarker.version>2.3.34</freemarker.version>
-        <p6spy.version>3.9.1</p6spy.version>
-        <knife4j.version>3.0.3</knife4j.version>
-        <swagger-annotations.version>1.5.22</swagger-annotations.version>
-        <mysql.version>9.3.0</mysql.version>
-        <ip2region.version>2.7.18.9</ip2region.version>
-        <aspectjrt.version>1.9.7</aspectjrt.version>
-        <captcha.version>1.6.2</captcha.version>
-        <commons-text.version>1.13.0</commons-text.version>
-        <transmittable.version>2.14.5</transmittable.version>
-        <ganymed-ssh2.version>build210</ganymed-ssh2.version>
-        <jsch.version>0.1.55</jsch.version>
-        <oshi.version>6.6.5</oshi.version>
-        <quartz.version>2.5.0</quartz.version>
-        <c3p0.version>0.10.1</c3p0.version>
-        <commons-net.version>3.11.1</commons-net.version>
-        <joda-time.version>2.12.7</joda-time.version>
-        <pinyin.version>2.0.3.RELEASE</pinyin.version>
-        <fastexcel.version>1.2.0</fastexcel.version>
-        <rhino.version>1.8.0</rhino.version>
-        <guava.version>33.5.0-jre</guava.version>
+        <mail.version>1.4.7</mail.version>
     </properties>
 
     <dependencies>
@@ -93,7 +71,7 @@
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
-            <version>${undertow.version}</version>
+            <version>2.3.18.Final</version>
         </dependency>
 
         <!-- Spring boot 测试 -->
@@ -157,7 +135,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>${freemarker.version}</version>
+            <version>2.3.34</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -166,6 +144,7 @@
         </dependency>
 
         <!--spring boot 集成redis所需common-pool2-->
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
@@ -180,14 +159,14 @@
         <dependency>
             <groupId>p6spy</groupId>
             <artifactId>p6spy</artifactId>
-            <version>${p6spy.version}</version>
+            <version>3.9.1</version>
         </dependency>
 
         <!-- Swagger UI 相关 -->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>${knife4j.version}</version>
+            <version>3.0.3</version>
             <exclusions>
                 <!-- 去掉 swagger-annotations 依赖, 避免冲突 -->
                 <exclusion>
@@ -199,14 +178,14 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations.version}</version>
+            <version>1.5.22</version>
         </dependency>
 
         <!-- Mysql依赖包 -->
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>${mysql.version}</version>
+            <version>9.3.0</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -221,20 +200,20 @@
         <dependency>
             <groupId>net.dreamlu</groupId>
             <artifactId>mica-ip2region</artifactId>
-            <version>${ip2region.version}</version>
+            <version>2.7.18.9</version>
         </dependency>
 
         <!-- AOP切面支持 -->
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>${aspectjrt.version}</version>
+            <version>1.9.7</version>
         </dependency>
         <!-- jvm启动参数 javaagent 支持 -->
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>${aspectjrt.version}</version>
+            <version>1.9.7</version>
         </dependency>
 
         <!-- lombok插件 -->
@@ -268,20 +247,20 @@
         <dependency>
             <groupId>com.github.whvcse</groupId>
             <artifactId>easy-captcha</artifactId>
-            <version>${captcha.version}</version>
+            <version>1.6.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>${commons-text.version}</version>
+            <version>1.13.0</version>
         </dependency>
 
         <!-- 提供增强的 InheritableThreadLocal, 即使用线程池组件也可以在线程之间传输值 -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>transmittable-thread-local</artifactId>
-            <version>${transmittable.version}</version>
+            <version>2.14.5</version>
         </dependency>
 
         <!-- druid spring监控 -->
@@ -318,25 +297,25 @@
         <dependency>
             <groupId>ch.ethz.ganymed</groupId>
             <artifactId>ganymed-ssh2</artifactId>
-            <version>${ganymed-ssh2.version}</version>
+            <version>build210</version>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
-            <version>${jsch.version}</version>
+            <version>0.1.55</version>
         </dependency>
 
         <!-- 获取系统信息 -->
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>${oshi.version}</version>
+            <version>6.6.5</version>
         </dependency>
 
         <!-- 邮件依赖 -->
         <dependency>
-            <groupId>jakarta.mail</groupId>
-            <artifactId>jakarta.mail-api</artifactId>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
             <version>${mail.version}</version>
         </dependency>
 
@@ -354,32 +333,32 @@
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>${quartz.version}</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
-            <version>${c3p0.version}</version>
+            <version>0.10.1</version>
         </dependency>
 
         <!-- CIDR解析 -->
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>${commons-net.version}</version>
+            <version>3.11.1</version>
         </dependency>
 
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>${joda-time.version}</version>
+            <version>2.12.7</version>
         </dependency>
 
         <!-- 拼音库 -->
         <dependency>
             <groupId>io.github.biezhi</groupId>
             <artifactId>TinyPinyin</artifactId>
-            <version>${pinyin.version}</version>
+            <version>2.0.3.RELEASE</version>
         </dependency>
 
         <!-- Excel导入导出 https://fast-excel.github.io/fastexcel/zh-cn/docs/quickstart/guide -->
@@ -387,7 +366,7 @@
         <dependency>
             <groupId>cn.idev.excel</groupId>
             <artifactId>fastexcel</artifactId>
-            <version>${fastexcel.version}</version>
+            <version>1.2.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -395,7 +374,7 @@
         <dependency>
             <groupId>org.mozilla</groupId>
             <artifactId>rhino</artifactId>
-            <version>${rhino.version}</version>
+            <version>1.8.0</version>
         </dependency>
     </dependencies>