Merge branch 'development' into 2.3.x

buession · Dec 25, 2023 · 4a1863f · 4a1863f
2 parents c3837df + 232c631
commit 4a1863f
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,99 @@ Buession Parent Changelog
 ===========================
 
 
+## [2.3.2](https://github.com/buession/buession-parent/releases/tag/v2.3.2) (2023-12-25)
+
+### 🔨依赖升级
+- [druid](https://github.com/alibaba/druid) 版本升级至 1.2.20
+- [fasterxml jackson](http://github.com/FasterXML/jackson) 版本升级至 2.16.0
+- [guava](https://github.com/google/guava) 版本升级至 32.1.3-jre
+- [google protobuf](https://github.com/google/protobuf-java) 版本升级至 3.25.1
+- [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) 版本升级至 12.4.2.jre8
+- [mysql-connector-j](http://dev.mysql.com/doc/connector-j/en/) 版本升级至 8.2.0
+- [rabbitmq amqp-client](https://www.rabbitmq.com) 版本升级至 5.20.0
+- [rabbitmq http-client](https://www.rabbitmq.com) 版本升级至 5.2.0
+- [okhttp3](https://square.github.io/okhttp/) 版本升级至 4.12.0
+- [commons-cli](https://commons.apache.org/proper/commons-cli/) 版本升级至 1.6.0
+- [commons-io ](https://commons.apache.org/proper/commons-io/) 版本升级至 2.15.0
+- [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.22
+- [io.micrometer](https://github.com/micrometer-metrics/micrometer) 版本升级至 1.12.0
+- [netty](https://netty.io/) 版本升级至 4.1.101.Final
+- [rxjava](https://github.com/ReactiveX/RxJava) 版本升级至 3.1.8
+- [commons-dbcp2](https://commons.apache.org/dbcp/) 版本升级至 2.11.0
+- [commons-text](https://commons.apache.org/proper/commons-text) 版本升级至 2.11.0
+- [commons-pool2](https://commons.apache.org/proper/commons-pool/) 版本升级至 2.12.0
+- [apache shiro](https://github.com/apache/shiro) 版本升级至 1.13.0
+- [tomcat-jdbc](https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-jdbc) 版本升级至 10.1.16
+- [aspectj](https://www.eclipse.org/aspectj/) 版本升级至 1.9.20.1
+- [bouncycastle](https://github.com/bcgit/bc-java) 版本升级至 1.77
+- [jetbrains annotations](https://github.com/JetBrains/java-annotations) 版本升级至 24.1.0
+- [kotlin](https://kotlinlang.org/) 版本升级至 1.9.20
+- [mongodb-driver-core](https://github.com/mongodb/mongo-java-driver) 版本升级至 4.11.1
+- [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) 版本升级至 4.11.1
+- [mybatis](http://www.mybatis.org/mybatis-3) 版本升级至 3.5.14
+- [objectweb asm](http://asm.ow2.io/) 版本升级至 9.6
+- [jedis](https://github.com/redis/jedis) 版本升级至 4.4.6
+
+
+### 漏洞修复
+
+- [netty](https://netty.io/) 修复 [CVE-2023-4586](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-4586) 漏洞
+
+
+---
+
+
+## [2.3.1](https://github.com/buession/buession-parent/releases/tag/v2.3.1) (2023-11-16)
+
+### 🔨依赖升级
+- [druid](https://github.com/alibaba/druid) 版本升级至 1.2.18
+- [fasterxml jackson](http://github.com/FasterXML/jackson) 版本升级至 2.15.2
+- [guava](https://github.com/google/guava) 版本升级至 32.1.2-jre
+- [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) 版本升级至 12.4.0
+- [mysql-connector-j](http://dev.mysql.com/doc/connector-j/en/) 版本升级至 8.1.0
+- [mysql-connector-java](http://dev.mysql.com/doc/connector-j/en/) 版本升级至 8.0.33
+- [rabbitmq amqp-client](https://www.rabbitmq.com) 版本升级至 5.18.0
+- [rabbitmq http-client](https://www.rabbitmq.com) 版本升级至 5.1.0
+- [okhttp3](https://square.github.io/okhttp/) 版本升级至 4.11.0
+- [commons-codec](https://commons.apache.org/proper/commons-codec/) 版本升级至 1.16.0
+- [commons-io ](https://commons.apache.org/proper/commons-io/) 版本升级至 2.13.0
+- [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.19
+- [io.micrometer](https://github.com/micrometer-metrics/micrometer) 版本升级至 1.11.3
+- [netty](https://netty.io/) 版本升级至 4.1.96.Final
+- [rxjava](https://github.com/ReactiveX/RxJava) 版本升级至 3.1.6
+- [apache commons-lang3](https://commons.apache.org/proper/commons-lang/) 版本升级至 3.13.0
+- [rocketmq](https://github.com/apache/rocketmq-clients/tree/master/java) 版本升级至 4.9.7
+- [apache shiro](https://github.com/apache/shiro) 版本升级至 1.12.0
+- [tomcat-jdbc](https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-jdbc) 版本升级至 10.1.12
+- [aspectj](https://www.eclipse.org/aspectj/) 版本升级至 1.9.20
+- [checker-qual](https://github.com/typetools/checker-framework) 版本升级至 3.37.0
+- [kotlin](https://kotlinlang.org/) 版本升级至 1.9.0
+- [jetbrains annotations](https://github.com/JetBrains/java-annotations) 版本升级至 24.0.1
+- [mapstruct](http://mapstruct.org/mapstruct/) 版本升级至 1.5.5.Final
+- [mongodb-driver-core](https://github.com/mongodb/mongo-java-driver) 版本升级至4.10.2
+- [mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) 版本升级至4.10.2
+- [mybatis-spring](https://github.com/mybatis/spring) 版本升级至 3.0.2
+- [objectweb asm](http://asm.ow2.io/) 版本升级至 9.5
+- [springframework](https://github.com/spring-projects/spring-framework) 版本升级至 5.2.25.RELEASE
+- [jedis](https://github.com/redis/jedis) 版本升级至 4.4.3
+- [spring-security-rsa](http://github.com/spring-projects/spring-security-oauth) 版本升级至 1.0.12
+- [bouncycastle](https://github.com/bcgit/bc-java) 版本升级至 1.76
+
+
+### ⭐ 新特性
+
+- 引入 [zookeeper](https://github.com/apache/zookeeper)
+- 引入 [google protobuf](https://github.com/google/protobuf-java)
+
+
+### 漏洞修复
+
+- [guava](https://github.com/google/guava) 修复 [CVE-2023-2976](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-2976) 漏洞
+
+
+---
+
+
 ## [2.3.0](https://github.com/buession/buession-parent/releases/tag/v2.3.0) (2023-08-15)
 
 ### 🔨依赖升级

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<artifactId>parent</artifactId>
 	<url>http://www.buession.com/</url>
 	<description>Buession Parent</description>
-	<version>2.3.0</version>
+	<version>2.3.2</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -48,35 +48,35 @@
 		<project.java.version>1.8</project.java.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
   		<maven.compiler.target>1.8</maven.compiler.target>
-		<springframework.version>5.2.22.RELEASE</springframework.version>
+		<springframework.version>5.2.25.RELEASE</springframework.version>
 		<springframework.boot.version>2.3.12.RELEASE</springframework.boot.version>
 		<springframework.security.version>5.3.13.RELEASE</springframework.security.version>
 		<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.7.22</kotlin.version>
+		<kotlin.version>1.9.20</kotlin.version>
 		<apache.httpcomponents5.version>5.2.1</apache.httpcomponents5.version>
-		<okhttp3.version>4.10.0</okhttp3.version>
-		<shiro.version>1.11.0</shiro.version>
+		<okhttp3.version>4.12.0</okhttp3.version>
+		<shiro.version>1.13.0</shiro.version>
 		<pac4j.version>4.5.7</pac4j.version>
 		<velocity.tools.version>3.1</velocity.tools.version>
 		<sun.jersey.version>1.19.4</sun.jersey.version>
 		<kafka.version>2.8.2</kafka.version>
-		<rocketmq.version>4.9.4</rocketmq.version>
-		<mongodb.version>4.9.0</mongodb.version>
-		<netty.version>4.1.89.Final</netty.version>
-		<fasterxml.jackson.core.version>2.14.2</fasterxml.jackson.core.version>
-		<fasterxml.jackson.datatype.version>2.14.2</fasterxml.jackson.datatype.version>
-		<fasterxml.jackson.dataformat.version>2.14.2</fasterxml.jackson.dataformat.version>
-		<fasterxml.jackson.jaxrs.version>2.14.2</fasterxml.jackson.jaxrs.version>
-		<fasterxml.jackson.module.version>2.14.2</fasterxml.jackson.module.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.10.5</io.micrometer.version>
-		<io.dropwizard.metrics.version>4.2.18</io.dropwizard.metrics.version>
-		<aspectj.version>1.9.19</aspectj.version>
-		<org.bouncycastle.version>1.70</org.bouncycastle.version>
-		<org.objectweb.asm.version>9.2</org.objectweb.asm.version>
-		<mapstruct.version>1.5.3.Final</mapstruct.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>
+		<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>
 	</properties>
@@ -362,7 +362,7 @@
 			<dependency>
 				<groupId>org.springframework.security</groupId>
 				<artifactId>spring-security-rsa</artifactId>
-				<version>1.0.11.RELEASE</version>
+				<version>1.0.12.RELEASE</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.springframework</groupId>
@@ -512,7 +512,7 @@
 			<dependency>
 			    <groupId>org.jetbrains</groupId>
 			    <artifactId>annotations</artifactId>
-			    <version>16.0.3</version>
+			    <version>24.1.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>org.jetbrains.kotlin</groupId>
@@ -543,7 +543,7 @@
 			<dependency>
 			    <groupId>org.apache.tomcat</groupId>
 			    <artifactId>tomcat-jdbc</artifactId>
-			    <version>10.1.7</version>
+			    <version>10.1.16</version>
       			<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -555,26 +555,26 @@
 			<dependency>
     			<groupId>org.apache.commons</groupId>
     			<artifactId>commons-dbcp2</artifactId>
-    			<version>2.9.0</version>
+    			<version>2.11.0</version>
       			<scope>compile</scope>
 			</dependency>
 			<dependency>
     			<groupId>com.alibaba</groupId>
     			<artifactId>druid</artifactId>
-    			<version>1.2.16</version>
+    			<version>1.2.20</version>
       			<scope>compile</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis</artifactId>
-				<version>3.5.13</version>
+				<version>3.5.14</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis-spring</artifactId>
-				<version>2.1.0</version>
+				<version>2.1.1</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -593,18 +593,18 @@
 			<dependency>
 				<groupId>mysql</groupId>
 				<artifactId>mysql-connector-java</artifactId>
-				<version>8.0.32</version>
+				<version>8.0.33</version>
 			</dependency>
 			<dependency>
 				<groupId>com.mysql</groupId>
 				<artifactId>mysql-connector-j</artifactId>
-				<version>8.0.32</version>
+				<version>8.2.0</version>
 			</dependency>
 
 			<dependency>
 				<groupId>com.microsoft.sqlserver</groupId>
 				<artifactId>mssql-jdbc</artifactId>
-				<version>12.2.0.jre8</version>
+				<version>12.4.2.jre8</version>
 			</dependency>
 
 			<dependency>
@@ -640,15 +640,27 @@
 				<version>${rocketmq.version}</version>
 			</dependency>
 
+			<dependency>
+			    <groupId>org.apache.zookeeper</groupId>
+			    <artifactId>zookeeper</artifactId>
+			    <version>3.9.1</version>
+			    <exclusions>
+					<exclusion>
+						<groupId>ch.qos.logback</groupId>
+						<artifactId>*</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
 			<dependency>
 			    <groupId>com.rabbitmq</groupId>
 			    <artifactId>amqp-client</artifactId>
-			    <version>5.17.0</version>
+			    <version>5.20.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>com.rabbitmq</groupId>
 			    <artifactId>http-client</artifactId>
-			    <version>5.0.0</version>
+			    <version>5.2.0</version>
 			</dependency>
 
 			<!-- velocity start -->
@@ -700,7 +712,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>31.1-jre</version>
+				<version>32.1.3-jre</version>
 				<exclusions>
 					<exclusion>
 						<groupId>com.google.guava</groupId>
@@ -713,11 +725,16 @@
 				<artifactId>jsr305</artifactId>
 				<version>3.0.2</version>
 			</dependency>
+			<dependency>
+			    <groupId>com.google.protobuf</groupId>
+			    <artifactId>protobuf-java</artifactId>
+			    <version>3.25.1</version>
+			</dependency>
 
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.12.0</version>
+				<version>3.13.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>commons-configuration</groupId>
@@ -738,7 +755,7 @@
 			<dependency>
 			    <groupId>org.apache.commons</groupId>
 			    <artifactId>commons-text</artifactId>
-			    <version>1.10.0</version>
+			    <version>1.11.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>org.apache.commons</groupId>
@@ -754,7 +771,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-pool2</artifactId>
-				<version>2.11.1</version>
+				<version>2.12.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>org.apache.commons</groupId>
@@ -818,7 +835,7 @@
 			<dependency>
 				<groupId>commons-codec</groupId>
 				<artifactId>commons-codec</artifactId>
-				<version>1.15</version>
+				<version>1.16.0</version>
 			</dependency>
 			<dependency>
     			<groupId>commons-attributes</groupId>
@@ -849,12 +866,12 @@
 			<dependency>
 			    <groupId>commons-io</groupId>
 			    <artifactId>commons-io</artifactId>
-			    <version>2.11.0</version>
+			    <version>2.15.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>commons-cli</groupId>
 			    <artifactId>commons-cli</artifactId>
-			    <version>1.5.0</version>
+			    <version>1.6.0</version>
 			</dependency>
 
 			<dependency>
@@ -908,7 +925,7 @@
 			<dependency>
 			    <groupId>redis.clients</groupId>
 			    <artifactId>jedis</artifactId>
-			    <version>4.3.2</version>
+			    <version>4.4.6</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -936,7 +953,7 @@
 			<dependency>
     			<groupId>org.checkerframework</groupId>
     			<artifactId>checker-qual</artifactId>
-    			<version>3.33.0</version>
+    			<version>3.37.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>cglib</groupId>
@@ -999,12 +1016,12 @@
 
 			<dependency>
     			<groupId>org.bouncycastle</groupId>
-    			<artifactId>bcprov-jdk15on</artifactId>
+    			<artifactId>bcprov-jdk18on</artifactId>
     			<version>${org.bouncycastle.version}</version>
 			</dependency>
 			<dependency>
     			<groupId>org.bouncycastle</groupId>
-    			<artifactId>bcpkix-jdk15on</artifactId>
+    			<artifactId>bcpkix-jdk18on</artifactId>
     			<version>${org.bouncycastle.version}</version>
 			</dependency>
 
@@ -1233,7 +1250,7 @@
 			<dependency>
 			    <groupId>io.reactivex.rxjava3</groupId>
 			    <artifactId>rxjava</artifactId>
-			    <version>3.0.13</version>
+			    <version>3.1.8</version>
 			</dependency>
 
 			<dependency>