From 846e8d6b3c4b995356d49563fabbb2733474a4bd Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Wed, 23 Aug 2023 13:06:01 +0800 Subject: [PATCH 1/7] Upgrade 2.1.0 --- CHANGELOG.md | 44 +++++++++++++++++++++++++++++++++ pom.xml | 70 ++++++++++++++++++++++++++-------------------------- 2 files changed, 79 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21594fe..31da0e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,50 @@ Buession Parent Changelog =========================== +## [2.3.1](https://github.com/buession/buession-parent/releases/tag/v2.3.1) (2023-xx-xx) + +### 🔨依赖升级 +- [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 + + +### 漏洞修复 + +- [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 index fd620df..13e02a7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ parent http://www.buession.com/ Buession Parent - 2.3.0 + 2.3.1 pom @@ -48,35 +48,35 @@ 1.8 1.8 1.8 - 5.2.22.RELEASE + 5.2.25.RELEASE 2.3.12.RELEASE 5.3.13.RELEASE 2.5.1.RELEASE 2.3.3.RELEASE 2.2 - 1.7.22 + 1.9.0 5.2.1 - 4.10.0 - 1.11.0 + 4.11.0 + 1.12.0 4.5.7 3.1 1.19.4 2.8.2 - 4.9.4 - 4.9.0 - 4.1.89.Final - 2.14.2 - 2.14.2 - 2.14.2 - 2.14.2 - 2.14.2 + 4.9.7 + 4.10.2 + 4.1.96.Final + 2.15.2 + 2.15.2 + 2.15.2 + 2.15.2 + 2.15.2 1.9.13 - 1.10.5 - 4.2.18 - 1.9.19 + 1.11.3 + 4.2.19 + 1.9.20 1.70 - 9.2 - 1.5.3.Final + 9.5 + 1.5.5.Final 1.7.36 2.20.0 @@ -362,7 +362,7 @@ org.springframework.security spring-security-rsa - 1.0.11.RELEASE + 1.0.12.RELEASE org.springframework @@ -512,7 +512,7 @@ org.jetbrains annotations - 16.0.3 + 24.0.1 org.jetbrains.kotlin @@ -543,7 +543,7 @@ org.apache.tomcat tomcat-jdbc - 10.1.7 + 10.1.12 compile @@ -561,7 +561,7 @@ com.alibaba druid - 1.2.16 + 1.2.18 compile @@ -574,7 +574,7 @@ org.mybatis mybatis-spring - 2.1.0 + 2.1.1 compile @@ -593,18 +593,18 @@ mysql mysql-connector-java - 8.0.32 + 8.0.33 com.mysql mysql-connector-j - 8.0.32 + 8.1.0 com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre8 + 12.4.0.jre8 @@ -643,12 +643,12 @@ com.rabbitmq amqp-client - 5.17.0 + 5.18.0 com.rabbitmq http-client - 5.0.0 + 5.1.0 @@ -700,7 +700,7 @@ com.google.guava guava - 31.1-jre + 32.1.2-jre com.google.guava @@ -717,7 +717,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.13.0 commons-configuration @@ -818,7 +818,7 @@ commons-codec commons-codec - 1.15 + 1.16.0 commons-attributes @@ -849,7 +849,7 @@ commons-io commons-io - 2.11.0 + 2.13.0 commons-cli @@ -908,7 +908,7 @@ redis.clients jedis - 4.3.2 + 4.4.3 compile @@ -936,7 +936,7 @@ org.checkerframework checker-qual - 3.33.0 + 3.37.0 cglib @@ -1233,7 +1233,7 @@ io.reactivex.rxjava3 rxjava - 3.0.13 + 3.1.6 From 0eff56bada219151c05afc35d375d479a55c04b9 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Fri, 15 Sep 2023 16:56:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?bouncycastle=20=E7=94=B1=20jdk15on=20?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=BA=20jdk18on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31da0e9..69907bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ Buession Parent Changelog - [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 ### 漏洞修复 diff --git a/pom.xml b/pom.xml index 13e02a7..758d1bc 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 1.11.3 4.2.19 1.9.20 - 1.70 + 1.76 9.5 1.5.5.Final 1.7.36 @@ -999,12 +999,12 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on ${org.bouncycastle.version} org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${org.bouncycastle.version} From 037e03c2f1a789163a78af615392fea99c8bd15d Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Wed, 25 Oct 2023 23:15:38 +0800 Subject: [PATCH 3/7] add google protobuf && zookeeper --- CHANGELOG.md | 6 ++++++ pom.xml | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69907bf..6ab2deb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,12 @@ Buession Parent Changelog - [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) 漏洞 diff --git a/pom.xml b/pom.xml index 758d1bc..88857dc 100644 --- a/pom.xml +++ b/pom.xml @@ -640,6 +640,18 @@ ${rocketmq.version} + + org.apache.zookeeper + zookeeper + 3.9.1 + + + ch.qos.logback + * + + + + com.rabbitmq amqp-client @@ -713,6 +725,11 @@ jsr305 3.0.2 + + com.google.protobuf + protobuf-java + 3.24.4 + org.apache.commons From c713b10046e04d4012c67ac526c942686b8fe3da Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Thu, 16 Nov 2023 22:37:41 +0800 Subject: [PATCH 4/7] release 2.3.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ab2deb..d2e7694 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Buession Parent Changelog =========================== -## [2.3.1](https://github.com/buession/buession-parent/releases/tag/v2.3.1) (2023-xx-xx) +## [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 From 3ceb0f0f522d2e5f5e43aa7ea96331d1bbb4a52c Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Fri, 17 Nov 2023 23:51:22 +0800 Subject: [PATCH 5/7] Upgrade 2.3.2 --- CHANGELOG.md | 43 +++++++++++++++++++++++++++++++++ pom.xml | 68 ++++++++++++++++++++++++++-------------------------- 2 files changed, 77 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2e7694..d6252b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,49 @@ Buession Parent Changelog =========================== +## [2.3.2](https://github.com/buession/buession-parent/releases/tag/v2.3.2) (2023-xx-xx) + +### 🔨依赖升级 +- [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 log4j](https://mvnrepository.com/artifact/org.apache.logging.log4j) 版本升级至 2.21.1 +- [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) ### 🔨依赖升级 diff --git a/pom.xml b/pom.xml index 88857dc..d4a6727 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ parent http://www.buession.com/ Buession Parent - 2.3.1 + 2.3.2 pom @@ -54,31 +54,31 @@ 2.5.1.RELEASE 2.3.3.RELEASE 2.2 - 1.9.0 + 1.9.20 5.2.1 - 4.11.0 - 1.12.0 + 4.12.0 + 1.13.0 4.5.7 3.1 1.19.4 2.8.2 4.9.7 - 4.10.2 - 4.1.96.Final - 2.15.2 - 2.15.2 - 2.15.2 - 2.15.2 - 2.15.2 + 4.11.1 + 4.1.101.Final + 2.16.0 + 2.16.0 + 2.16.0 + 2.16.0 + 2.16.0 1.9.13 - 1.11.3 - 4.2.19 - 1.9.20 - 1.76 - 9.5 + 1.12.0 + 4.2.22 + 1.9.20.1 + 1.77 + 9.6 1.5.5.Final 1.7.36 - 2.20.0 + 2.21.1 @@ -512,7 +512,7 @@ org.jetbrains annotations - 24.0.1 + 24.1.0 org.jetbrains.kotlin @@ -543,7 +543,7 @@ org.apache.tomcat tomcat-jdbc - 10.1.12 + 10.1.16 compile @@ -555,20 +555,20 @@ org.apache.commons commons-dbcp2 - 2.9.0 + 2.11.0 compile com.alibaba druid - 1.2.18 + 1.2.20 compile org.mybatis mybatis - 3.5.13 + 3.5.14 compile @@ -598,13 +598,13 @@ com.mysql mysql-connector-j - 8.1.0 + 8.2.0 com.microsoft.sqlserver mssql-jdbc - 12.4.0.jre8 + 12.4.2.jre8 @@ -655,12 +655,12 @@ com.rabbitmq amqp-client - 5.18.0 + 5.20.0 com.rabbitmq http-client - 5.1.0 + 5.2.0 @@ -712,7 +712,7 @@ com.google.guava guava - 32.1.2-jre + 32.1.3-jre com.google.guava @@ -728,7 +728,7 @@ com.google.protobuf protobuf-java - 3.24.4 + 3.25.1 @@ -755,7 +755,7 @@ org.apache.commons commons-text - 1.10.0 + 1.11.0 org.apache.commons @@ -771,7 +771,7 @@ org.apache.commons commons-pool2 - 2.11.1 + 2.12.0 org.apache.commons @@ -866,12 +866,12 @@ commons-io commons-io - 2.13.0 + 2.15.0 commons-cli commons-cli - 1.5.0 + 1.6.0 @@ -925,7 +925,7 @@ redis.clients jedis - 4.4.3 + 4.4.6 compile @@ -1250,7 +1250,7 @@ io.reactivex.rxjava3 rxjava - 3.1.6 + 3.1.8 From 67e7385d1e1e1f9fcb13eeaf4025a7f22a55442f Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Mon, 25 Dec 2023 00:23:38 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=81=A2=E5=A4=8D=20apache=20log4j=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=B3=202.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 - pom.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6252b4..af4817a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,6 @@ Buession Parent Changelog - [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 log4j](https://mvnrepository.com/artifact/org.apache.logging.log4j) 版本升级至 2.21.1 - [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 diff --git a/pom.xml b/pom.xml index d4a6727..9302e86 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 9.6 1.5.5.Final 1.7.36 - 2.21.1 + 2.20.0 From 232c631169cba0ba3ae9227746c36dfc7ea12387 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Mon, 25 Dec 2023 12:02:26 +0800 Subject: [PATCH 7/7] Release 2.3.2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af4817a..c91b148 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Buession Parent Changelog =========================== -## [2.3.2](https://github.com/buession/buession-parent/releases/tag/v2.3.2) (2023-xx-xx) +## [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