odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(deps): 统一管理依赖版本并升级部分组件

Browse Source 
- 将所有依赖版本提取到 properties 中统一管理
- 降级 fastjson2 版本从 2.0.60 到 2.0.59
- 升级 hutool 版本从 5.8.40 到 5.8.41
- 升级 mail 版本并更换 groupId 和 artifactId为 jakarta.mail
- 添加 undertow、freemarker、p6spy、knife4j 等新依赖版本配置
- 统一配置 mysql、ip2region、aspectjrt、captcha 等依赖版本
- 移除重复或注释掉的依赖声明
- 更新 fastjson2 扩展模块以适配 Spring6
- 添加 guava 等工具库的版本管理
- 调整部分依赖的版本引用方式以支持统一维护
This commit is contained in:
odboy
2025-10-31 11:21:35 +08:00
parent 31c7e43d7c
commit daae9b953a
2 changed files with 98 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava-springboot3/pom.xml
+49 -29
View File
@@ -28,15 +28,36 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<java.version>17</java.version>
<fastjson2.version>2.0.60</fastjson2.version>
<fastjson2.version>2.0.59</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.40</hutool.version>
<hutool.version>5.8.41</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>1.4.7</mail.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>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>
<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>
</properties>
<dependencies>
@@ -70,7 +91,7 @@
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>2.3.18.Final</version>
<version>${undertow.version}</version>
</dependency>
<!-- Spring boot 测试 -->
@@ -134,7 +155,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.34</version>
<version>${freemarker.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
@@ -143,7 +164,6 @@
</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>
@@ -158,21 +178,21 @@
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>3.9.1</version>
<version>${p6spy.version}</version>
</dependency>
<!-- Spring Boot 3 只支持OpenAPI3规范 -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
<version>4.5.0</version>
<version>${knife4j.version}</version>
</dependency>
<!-- Mysql依赖包 -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>9.3.0</version>
<version>${mysql.version}</version>
<scope>runtime</scope>
</dependency>
@@ -187,20 +207,20 @@
<dependency>
<groupId>net.dreamlu</groupId>
<artifactId>mica-ip2region</artifactId>
<version>2.7.18.9</version>
<version>${ip2region.version}</version>
</dependency>
<!-- AOP切面支持 -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.9.7</version>
<version>${aspectjrt.version}</version>
</dependency>
<!-- jvm启动参数 javaagent 支持 -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.7</version>
<version>${aspectjrt.version}</version>
</dependency>
<!-- lombok插件 -->
@@ -226,7 +246,7 @@
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring5</artifactId>
<artifactId>fastjson2-extension-spring6</artifactId>
<version>${fastjson2.version}</version>
</dependency>
@@ -234,20 +254,20 @@
<dependency>
<groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId>
<version>1.6.2</version>
<version>${captcha.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.13.0</version>
<version>${commons-text.version}</version>
</dependency>
<!-- 提供增强的 InheritableThreadLocal, 即使用线程池组件也可以在线程之间传输值 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>2.14.5</version>
<version>${transmittable.version}</version>
</dependency>
<!-- druid spring监控 -->
@@ -284,25 +304,25 @@
<dependency>
<groupId>ch.ethz.ganymed</groupId>
<artifactId>ganymed-ssh2</artifactId>
<version>build210</version>
<version>${ganymed-ssh2.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version>
<version>${jsch.version}</version>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>6.6.5</version>
<version>${oshi.version}</version>
</dependency>
<!-- 邮件依赖 -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>${mail.version}</version>
</dependency>
@@ -320,32 +340,32 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.5.0</version>
<version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
<version>0.10.1</version>
<version>${c3p0.version}</version>
</dependency>
<!-- CIDR解析 -->
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.11.1</version>
<version>${commons-net.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.12.7</version>
<version>${joda-time.version}</version>
</dependency>
<!-- 拼音库 -->
<dependency>
<groupId>io.github.biezhi</groupId>
<artifactId>TinyPinyin</artifactId>
<version>2.0.3.RELEASE</version>
<version>${pinyin.version}</version>
</dependency>
<!-- Excel导入导出 https://fast-excel.github.io/fastexcel/zh-cn/docs/quickstart/guide -->
@@ -353,7 +373,7 @@
<dependency>
<groupId>cn.idev.excel</groupId>
<artifactId>fastexcel</artifactId>
<version>1.2.0</version>
<version>${fastexcel.version}</version>
<scope>compile</scope>
</dependency>
@@ -361,13 +381,13 @@
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<version>1.8.0</version>
<version>${rhino.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.5.0-jre</version>
<version>${guava.version}</version>
</dependency>
</dependencies>
cutejava/pom.xml
+49 -83
View File
@@ -29,16 +29,37 @@
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<java.version>11</java.version>
<logback.version>1.2.9</logback.version>
<fastjson2.version>2.0.60</fastjson2.version>
<fastjson2.version>2.0.59</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.40</hutool.version>
<!-- <jjwt.version>0.11.5</jjwt.version>-->
<hutool.version>5.8.41</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>1.4.7</mail.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>
</properties>
<dependencies>
@@ -72,7 +93,7 @@
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>2.3.18.Final</version>
<version>${undertow.version}</version>
</dependency>
<!-- Spring boot 测试 -->
@@ -106,13 +127,6 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/org.redisson/redisson &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.redisson</groupId>-->
<!-- <artifactId>redisson</artifactId>-->
<!-- <version>3.50.0</version>-->
<!-- </dependency>-->
<!-- Spring boot websocket -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -143,7 +157,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.34</version>
<version>${freemarker.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
@@ -152,7 +166,6 @@
</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>
@@ -167,14 +180,14 @@
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>3.9.1</version>
<version>${p6spy.version}</version>
</dependency>
<!-- Swagger UI 相关 -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>3.0.3</version>
<version>${knife4j.version}</version>
<exclusions>
<!-- 去掉 swagger-annotations 依赖, 避免冲突 -->
<exclusion>
@@ -186,14 +199,14 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.22</version>
<version>${swagger-annotations.version}</version>
</dependency>
<!-- Mysql依赖包 -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>9.3.0</version>
<version>${mysql.version}</version>
<scope>runtime</scope>
</dependency>
@@ -208,20 +221,20 @@
<dependency>
<groupId>net.dreamlu</groupId>
<artifactId>mica-ip2region</artifactId>
<version>2.7.18.9</version>
<version>${ip2region.version}</version>
</dependency>
<!-- AOP切面支持 -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.9.7</version>
<version>${aspectjrt.version}</version>
</dependency>
<!-- jvm启动参数 javaagent 支持 -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.7</version>
<version>${aspectjrt.version}</version>
</dependency>
<!-- lombok插件 -->
@@ -238,23 +251,6 @@
<optional>true</optional>
</dependency>
<!-- excel工具 -->
<!-- <dependency>-->
<!-- <groupId>org.apache.poi</groupId>-->
<!-- <artifactId>poi</artifactId>-->
<!-- <version>5.4.0</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.poi</groupId>-->
<!-- <artifactId>poi-ooxml</artifactId>-->
<!-- <version>5.4.0</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>xerces</groupId>-->
<!-- <artifactId>xercesImpl</artifactId>-->
<!-- <version>2.12.2</version>-->
<!-- </dependency>-->
<!-- fastjson2 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
@@ -272,20 +268,20 @@
<dependency>
<groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId>
<version>1.6.2</version>
<version>${captcha.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.13.0</version>
<version>${commons-text.version}</version>
</dependency>
<!-- 提供增强的 InheritableThreadLocal, 即使用线程池组件也可以在线程之间传输值 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>2.14.5</version>
<version>${transmittable.version}</version>
</dependency>
<!-- druid spring监控 -->
@@ -322,25 +318,25 @@
<dependency>
<groupId>ch.ethz.ganymed</groupId>
<artifactId>ganymed-ssh2</artifactId>
<version>build210</version>
<version>${ganymed-ssh2.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version>
<version>${jsch.version}</version>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>6.6.5</version>
<version>${oshi.version}</version>
</dependency>
<!-- 邮件依赖 -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>${mail.version}</version>
</dependency>
@@ -358,62 +354,32 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.5.0</version>
<version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
<version>0.10.1</version>
<version>${c3p0.version}</version>
</dependency>
<!-- CIDR解析 -->
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.11.1</version>
<version>${commons-net.version}</version>
</dependency>
<!-- https://blog.csdn.net/q854214434/article/details/102374684 -->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-jta-atomikos</artifactId>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; 旧版本 dingtalk sdk &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.aliyun</groupId>-->
<!-- <artifactId>alibaba-dingtalk-service-sdk</artifactId>-->
<!-- <version>2.0.0</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>javax.mail</groupId>-->
<!-- <artifactId>mail</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; 新版本 dingtalk sdk &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.aliyun</groupId>-->
<!-- <artifactId>dingtalk</artifactId>-->
<!-- <version>2.0.66</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; stream流 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.dingtalk.open</groupId>-->
<!-- <artifactId>app-stream-client</artifactId>-->
<!-- <version>1.3.7</version>-->
<!-- </dependency>-->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.12.7</version>
<version>${joda-time.version}</version>
</dependency>
<!-- 拼音库 -->
<dependency>
<groupId>io.github.biezhi</groupId>
<artifactId>TinyPinyin</artifactId>
<version>2.0.3.RELEASE</version>
<version>${pinyin.version}</version>
</dependency>
<!-- Excel导入导出 https://fast-excel.github.io/fastexcel/zh-cn/docs/quickstart/guide -->
@@ -421,7 +387,7 @@
<dependency>
<groupId>cn.idev.excel</groupId>
<artifactId>fastexcel</artifactId>
<version>1.2.0</version>
<version>${fastexcel.version}</version>
<scope>compile</scope>
</dependency>
@@ -429,7 +395,7 @@
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<version>1.8.0</version>
<version>${rhino.version}</version>
</dependency>
</dependencies>