From 8e07fe979a47676a55657ad9927fecf684dc335e Mon Sep 17 00:00:00 2001
From: "Yong.Teng" <webmaster@buession.com>
Date: Thu, 1 Feb 2024 15:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 24 ++++++++++++++++---
 pom.xml      | 65 +++++++++++++++++++---------------------------------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 883eb8d..7de704b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,30 @@ Buession Parent Changelog
 ## [2.3.3](https://github.com/buession/buession-parent/releases/tag/v2.3.3) (2024-xx-xx)
 
 ### 🔨依赖升级
-- [druid](https://github.com/alibaba/druid) 版本升级至 1.2.20
+- [fasterxml jackson](http://github.com/FasterXML/jackson) 版本升级至 2.16.1
+- [guava](https://github.com/google/guava) 版本升级至 33.0.0-jre
+- [commons-io ](https://commons.apache.org/proper/commons-io/) 版本升级至 2.15.1
+- [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.23
+- [io.micrometer](https://github.com/micrometer-metrics/micrometer) 版本升级至 1.12.1
+- [netty](https://netty.io/) 版本升级至 4.1.104.Final
+- [apache commons-lang3](https://commons.apache.org/proper/commons-lang/) 版本升级至 3.14.0
+- [tomcat-jdbc](https://tomcat.apache.org/) 版本升级至 10.1.17
+- [aspectj](https://www.eclipse.org/aspectj/) 版本升级至 1.9.21
+- [checker-qual](https://github.com/typetools/checker-framework) 版本升级至 3.42.0
+- [kotlin](https://kotlinlang.org/) 版本升级至 1.9.22
+- [mybatis](http://www.mybatis.org/mybatis-3) 版本升级至 3.5.15
+- [mybatis-spring](https://github.com/mybatis/spring) 版本升级至 2.1.2
+- [apache log4j](https://mvnrepository.com/artifact/org.apache.logging.log4j) 版本升级至 2.21.1
 
 
-### 漏洞修复
+### ⭐ 新特性
 
-- [netty](https://netty.io/) 修复 [CVE-2023-4586](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-4586) 漏洞
+- 引入 [fastjson2](https://github.com/alibaba/fastjson2)
+
+
+### 🔔 变化
+
+- 移除 org.codehaus.jackson
 
 
 ---
diff --git a/pom.xml b/pom.xml
index 3d9e81f..f27f401 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
 		<springframework.webflow.version>2.5.1.RELEASE</springframework.webflow.version>
 		<springframework.session.version>2.3.3.RELEASE</springframework.session.version>
 		<commons.attributes.version>2.2</commons.attributes.version>
-		<kotlin.version>1.9.20</kotlin.version>
+		<kotlin.version>1.9.22</kotlin.version>
 		<apache.httpcomponents5.version>5.2.1</apache.httpcomponents5.version>
 		<okhttp3.version>4.12.0</okhttp3.version>
 		<shiro.version>1.13.0</shiro.version>
@@ -64,21 +64,20 @@
 		<kafka.version>2.8.2</kafka.version>
 		<rocketmq.version>4.9.7</rocketmq.version>
 		<mongodb.version>4.11.1</mongodb.version>
-		<netty.version>4.1.101.Final</netty.version>
-		<fasterxml.jackson.core.version>2.16.0</fasterxml.jackson.core.version>
-		<fasterxml.jackson.datatype.version>2.16.0</fasterxml.jackson.datatype.version>
-		<fasterxml.jackson.dataformat.version>2.16.0</fasterxml.jackson.dataformat.version>
-		<fasterxml.jackson.jaxrs.version>2.16.0</fasterxml.jackson.jaxrs.version>
-		<fasterxml.jackson.module.version>2.16.0</fasterxml.jackson.module.version>
-		<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
-		<io.micrometer.version>1.12.0</io.micrometer.version>
-		<io.dropwizard.metrics.version>4.2.22</io.dropwizard.metrics.version>
-		<aspectj.version>1.9.20.1</aspectj.version>
+		<netty.version>4.1.104.Final</netty.version>
+		<fasterxml.jackson.core.version>2.16.1</fasterxml.jackson.core.version>
+		<fasterxml.jackson.datatype.version>2.16.1</fasterxml.jackson.datatype.version>
+		<fasterxml.jackson.dataformat.version>2.16.1</fasterxml.jackson.dataformat.version>
+		<fasterxml.jackson.jaxrs.version>2.16.1</fasterxml.jackson.jaxrs.version>
+		<fasterxml.jackson.module.version>2.16.1</fasterxml.jackson.module.version>
+		<io.micrometer.version>1.12.1</io.micrometer.version>
+		<io.dropwizard.metrics.version>4.2.23</io.dropwizard.metrics.version>
+		<aspectj.version>1.9.21</aspectj.version>
 		<org.bouncycastle.version>1.77</org.bouncycastle.version>
 		<org.objectweb.asm.version>9.6</org.objectweb.asm.version>
 		<mapstruct.version>1.5.5.Final</mapstruct.version>
 		<slf4j.version>1.7.36</slf4j.version>
-		<apache.logging.log4j.version>2.20.0</apache.logging.log4j.version>
+		<apache.logging.log4j.version>2.21.1</apache.logging.log4j.version>
 	</properties>
 
 	<dependencyManagement>
@@ -543,7 +542,7 @@
 			<dependency>
 			    <groupId>org.apache.tomcat</groupId>
 			    <artifactId>tomcat-jdbc</artifactId>
-			    <version>10.1.16</version>
+			    <version>10.1.17</version>
       			<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -568,13 +567,13 @@
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis</artifactId>
-				<version>3.5.14</version>
+				<version>3.5.15</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis-spring</artifactId>
-				<version>2.1.1</version>
+				<version>2.1.2</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -712,7 +711,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>32.1.3-jre</version>
+				<version>33.0.0-jre</version>
 				<exclusions>
 					<exclusion>
 						<groupId>com.google.guava</groupId>
@@ -734,7 +733,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.13.0</version>
+				<version>3.14.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>commons-configuration</groupId>
@@ -866,7 +865,7 @@
 			<dependency>
 			    <groupId>commons-io</groupId>
 			    <artifactId>commons-io</artifactId>
-			    <version>2.15.0</version>
+			    <version>2.15.1</version>
 			</dependency>
 			<dependency>
 			    <groupId>commons-cli</groupId>
@@ -953,7 +952,7 @@
 			<dependency>
     			<groupId>org.checkerframework</groupId>
     			<artifactId>checker-qual</artifactId>
-    			<version>3.37.0</version>
+    			<version>3.42.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>cglib</groupId>
@@ -1447,34 +1446,16 @@
 			</dependency>
 			<!-- fasterxml jackson end -->
 
-			<!-- codehaus jackson start -->
-			<dependency>
-			    <groupId>org.codehaus.jackson</groupId>
-			    <artifactId>jackson-core-asl</artifactId>
-			    <version>${codehaus.jackson.version}</version>
-			</dependency>
-			<dependency>
-			    <groupId>org.codehaus.jackson</groupId>
-			    <artifactId>jackson-mapper-asl</artifactId>
-			    <version>${codehaus.jackson.version}</version>
-			</dependency>
-			<dependency>
-			    <groupId>org.codehaus.jackson</groupId>
-			    <artifactId>jackson-jaxrs</artifactId>
-			    <version>${codehaus.jackson.version}</version>
-			</dependency>
-			<dependency>
-			    <groupId>org.codehaus.jackson</groupId>
-			    <artifactId>jackson-xc</artifactId>
-			    <version>${codehaus.jackson.version}</version>
-			</dependency>
-			<!-- codehaus jackson end -->
-
 			<dependency>
 			    <groupId>com.alibaba</groupId>
 			    <artifactId>fastjson</artifactId>
 			    <version>1.2.83</version>
 			</dependency>
+			<dependency>
+			    <groupId>com.alibaba</groupId>
+			    <artifactId>fastjson2</artifactId>
+			    <version>2.0.44</version>
+			</dependency>
 
 			<dependency>
 			    <groupId>com.google.code.gson</groupId>