From fd55af18aaf08001eed9794dc723113137512254 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Fri, 31 Mar 2023 22:15:45 +0800 Subject: [PATCH 1/9] Upgrade 2.3.0 --- CHANGELOG.md | 8 ++++++++ pom.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c540ee3..fda1048 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ Buession Parent Changelog =========================== +## [2.3.0](https://github.com/buession/buession-parent/releases/tag/v2.3.0) (2023-xx-xx) + +### 🔨依赖升级 + + +--- + + ## [2.2.1](https://github.com/buession/buession-parent/releases/tag/v2.2.1) (2023-03-31) ### 🔨依赖升级 diff --git a/pom.xml b/pom.xml index 5ad46b0..55886de 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ parent http://www.buession.com/ Buession Parent - 2.2.1 + 2.3.0 pom From a2f9a699e553029c3df0b2dbd053fd859a31cac1 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Wed, 5 Apr 2023 12:45:06 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E9=A1=B9=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 21 +++++++++++++++++++++ pom.xml | 30 ++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fda1048..0cc2b73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,27 @@ Buession Parent Changelog ## [2.3.0](https://github.com/buession/buession-parent/releases/tag/v2.3.0) (2023-xx-xx) ### 🔨依赖升级 +- [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.18 +- [io.micrometer](https://github.com/micrometer-metrics/micrometer) 版本升级至 1.10.5 +- [joda-time](https://www.joda.org/joda-time/) 版本升级至 2.12.5 +- [mysql-connector-java](http://dev.mysql.com/doc/connector-j/en/) 版本升级至 8.0.32 +- [checker-qual](https://github.com/typetools/checker-framework) 版本升级至 3.33.0 +- [jedis](https://github.com/redis/jedis) 版本升级至 4.3.2 +- [mybatis](http://www.mybatis.org/mybatis-3) 版本升级至 3.5.13 +- [mybatis-spring](https://github.com/mybatis/spring) 版本升级至 2.1.0 +- [dom4j](http://dom4j.github.io/) 版本升级至 2.1.4 +- [apache log4j](https://mvnrepository.com/artifact/org.apache.logging.log4j) 版本升级至 2.20.0 + + +### ⭐ 新特性 + +- 引入 [apache httpcomponents httpasyncclient](http://hc.apache.org/httpcomponents-asyncclient) +- 引入 [apache httpcomponents httpcore-nio](http://hc.apache.org/httpcomponents-core-ga) + + +### 漏洞修复 + +- [mysql-connector-java](http://dev.mysql.com/doc/connector-j/en/) 修复 [CVE-2021-2471](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-2471) 、 [CVE-2022-21363](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21363) 、 [CVE-2022-41853](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-41853) 漏洞 --- diff --git a/pom.xml b/pom.xml index 55886de..2afab3a 100644 --- a/pom.xml +++ b/pom.xml @@ -67,13 +67,13 @@ 2.14.2 2.14.2 1.9.13 - 1.10.4 - 4.2.17 + 1.10.5 + 4.2.18 1.9.19 1.70 1.5.3.Final 1.7.36 - 2.18.0 + 2.20.0 @@ -505,13 +505,13 @@ org.mybatis mybatis - 3.5.11 + 3.5.13 compile org.mybatis mybatis-spring - 2.0.7 + 2.1.0 compile @@ -530,7 +530,7 @@ mysql mysql-connector-java - 8.0.23 + 8.0.32 @@ -645,11 +645,21 @@ httpcore 4.4.16 + + org.apache.httpcomponents + httpcore-nio + 4.4.16 + org.apache.httpcomponents httpclient 4.5.14 + + org.apache.httpcomponents + httpasyncclient + 4.1.5 + org.apache.httpcomponents httpmime @@ -742,7 +752,7 @@ redis.clients jedis - 4.3.1 + 4.3.2 compile @@ -755,7 +765,7 @@ joda-time joda-time - 2.12.1 + 2.12.5 com.fasterxml @@ -765,12 +775,12 @@ org.dom4j dom4j - 2.1.3 + 2.1.4 org.checkerframework checker-qual - 3.27.0 + 3.33.0 cglib From 8567c601c1352b8a1ca3424c25368c2d48ec9601 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Wed, 5 Apr 2023 12:51:37 +0800 Subject: [PATCH 3/9] apache httpcomponents 5 --- CHANGELOG.md | 3 ++- pom.xml | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cc2b73..56ad0cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,11 +21,12 @@ Buession Parent Changelog - 引入 [apache httpcomponents httpasyncclient](http://hc.apache.org/httpcomponents-asyncclient) - 引入 [apache httpcomponents httpcore-nio](http://hc.apache.org/httpcomponents-core-ga) +- 引入 [apache httpcomponents 5](https://hc.apache.org/httpcomponents-client-5.2.x/) ### 漏洞修复 -- [mysql-connector-java](http://dev.mysql.com/doc/connector-j/en/) 修复 [CVE-2021-2471](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-2471) 、 [CVE-2022-21363](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21363) 、 [CVE-2022-41853](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-41853) 漏洞 +- [mysql-connector-java](http://dev.mysql.com/doc/connector-j/en/) 修复 [CVE-2021-2471](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-2471) 、 [CVE-2022-21363](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21363) 漏洞 --- diff --git a/pom.xml b/pom.xml index 2afab3a..e1d5040 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ 2.5.1.RELEASE 2.2 1.7.22 + 5.2.1 4.10.0 1.11.0 4.5.7 @@ -665,6 +666,16 @@ httpmime 4.5.14 + + org.apache.httpcomponents.core5 + httpcore5 + 5.2.1 + + + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 + commons-codec From 91b7abb1ef6944f505039da76dc100924fc4d759 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Wed, 5 Apr 2023 22:15:54 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20maven=20=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index e1d5040..0344f46 100644 --- a/pom.xml +++ b/pom.xml @@ -641,6 +641,11 @@ 3.2 + + org.apache.httpcomponents + httpmime + 4.5.14 + org.apache.httpcomponents httpcore @@ -661,20 +666,15 @@ httpasyncclient 4.1.5 - - org.apache.httpcomponents - httpmime - 4.5.14 - org.apache.httpcomponents.core5 httpcore5 - 5.2.1 + ${apache.httpcomponents5.version} org.apache.httpcomponents.client5 httpclient5 - 5.2.1 + ${apache.httpcomponents5.version} @@ -1394,7 +1394,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 ${project.build.encoding} ${project.java.version} @@ -1405,7 +1405,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.2 + 3.3.0 @@ -1434,7 +1434,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.5.0 ${project.build.encoding} ${project.build.encoding} @@ -1460,7 +1460,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 + 3.2.1 ${project.basedir}/../checkstyle.xml ${project.build.encoding} @@ -1483,7 +1483,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.0.0 **/*Tests.java @@ -1494,7 +1494,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.0.0 true false @@ -1505,7 +1505,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts From 559ede8bcf5beb35585d6f6c383a87b9d5299f2b Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Mon, 24 Apr 2023 22:30:45 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=BC=95=E5=85=A5=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 10 ++++ pom.xml | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 136 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56ad0cf..06f162c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,17 @@ Buession Parent Changelog - 引入 [apache httpcomponents httpasyncclient](http://hc.apache.org/httpcomponents-asyncclient) - 引入 [apache httpcomponents httpcore-nio](http://hc.apache.org/httpcomponents-core-ga) +- 引入 [pache httpcomponents httpclient-cache](http://hc.apache.org/httpcomponents-client-ga) - 引入 [apache httpcomponents 5](https://hc.apache.org/httpcomponents-client-5.2.x/) +- 引入 [mysql-connector-j](http://dev.mysql.com/doc/connector-j/en/) +- 引入 [mongodb-driver-sync](https://www.mongodb.com/) +- 引入 [spring-data-cassandra](https://github.com/spring-projects/spring-data-cassandra/tree/master/spring-data-cassandra) +- 引入 [spring-session-data-mongodb](https://spring.io/projects/spring-session) +- 引入 [spring-session-hazelcast](https://spring.io/projects/spring-session) +- 引入 [spring-session-jdbc](https://spring.io/projects/spring-session) +- 引入 [commons-text](https://commons.apache.org/proper/commons-text) +- 引入 [commons-jexl3](https://commons.apache.org/proper/commons-jexl/) +- 引入 [objectweb asm](http://asm.ow2.io/) ### 漏洞修复 diff --git a/pom.xml b/pom.xml index 0344f46..cba5e0f 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,7 @@ 2.3.12.RELEASE 5.3.13.RELEASE 2.5.1.RELEASE + 2.3.3.RELEASE 2.2 1.7.22 5.2.1 @@ -72,6 +73,7 @@ 4.2.18 1.9.19 1.70 + 9.2 1.5.3.Final 1.7.36 2.20.0 @@ -294,10 +296,47 @@ 2.3.9.RELEASE compile + + org.springframework.data + spring-data-cassandra + 3.0.9.RELEASE + compile + + + + org.springframework.session + spring-session-core + ${springframework.session.version} + compile + org.springframework.session spring-session-data-redis - 2.3.3.RELEASE + ${springframework.session.version} + compile + + + org.springframework.session + spring-session-data-mongodb + 2.3.2.RELEASE + compile + + + org.springframework.session + spring-session-hazelcast + ${springframework.session.version} + compile + + + javax.annotation + javax.annotation-api + + + + + org.springframework.session + spring-session-jdbc + ${springframework.session.version} compile @@ -467,6 +506,16 @@ kotlin-stdlib ${kotlin.version} + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + org.jetbrains.kotlin kotlin-stdlib-common @@ -533,6 +582,11 @@ mysql-connector-java 8.0.32 + + com.mysql + mysql-connector-j + 8.0.32 + com.microsoft.sqlserver @@ -545,6 +599,11 @@ mongodb-driver-core ${mongodb.version} + + org.mongodb + mongodb-driver-sync + ${mongodb.version} + @@ -630,6 +689,22 @@ commons-collections4 4.4 + + org.apache.commons + commons-text + 1.10.0 + + + org.apache.commons + commons-jexl3 + 3.3 + + + commons-logging + commons-logging + + + org.apache.commons commons-pool2 @@ -651,6 +726,17 @@ httpcore 4.4.16 + + org.apache.httpcomponents + httpclient-cache + 4.5.14 + + + commons-logging + commons-logging + + + org.apache.httpcomponents httpcore-nio @@ -757,6 +843,13 @@ io.netty netty-transport-native-epoll + linux-x86_64 + ${netty.version} + + + io.netty + netty-transport-native-kqueue + osx-x86_64 ${netty.version} @@ -863,6 +956,27 @@ ${org.bouncycastle.version} + + org.ow2.asm + asm + ${org.objectweb.asm.version} + + + org.ow2.asm + asm-commons + ${org.objectweb.asm.version} + + + org.ow2.asm + asm-analysis + ${org.objectweb.asm.version} + + + org.ow2.asm + asm-tree + ${org.objectweb.asm.version} + + com.sun.jersey jersey-core @@ -946,6 +1060,12 @@ io.micrometer micrometer-registry-cloudwatch ${io.micrometer.version} + + + commons-logging + commons-logging + + io.micrometer @@ -1058,6 +1178,11 @@ rxjava-reactive-streams 1.2.1 + + io.reactivex.rxjava3 + rxjava + 3.0.13 + io.projectreactor From dd9a1f5643828526467c6474f20917644a69a3bc Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Sat, 27 May 2023 00:55:00 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=BC=95=E5=85=A5=20spring-data-elasticsea?= =?UTF-8?q?rch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- pom.xml | 36 +++++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06f162c..e11dd88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,8 @@ Buession Parent Changelog - 引入 [apache httpcomponents 5](https://hc.apache.org/httpcomponents-client-5.2.x/) - 引入 [mysql-connector-j](http://dev.mysql.com/doc/connector-j/en/) - 引入 [mongodb-driver-sync](https://www.mongodb.com/) -- 引入 [spring-data-cassandra](https://github.com/spring-projects/spring-data-cassandra/tree/master/spring-data-cassandra) +- 引入 [spring-data-cassandra](https://github.com/spring-projects/spring-data-cassandra) +- 引入 [spring-data-elasticsearch](https://github.com/spring-projects/spring-data-elasticsearch) - 引入 [spring-session-data-mongodb](https://spring.io/projects/spring-session) - 引入 [spring-session-hazelcast](https://spring.io/projects/spring-session) - 引入 [spring-session-jdbc](https://spring.io/projects/spring-session) diff --git a/pom.xml b/pom.xml index cba5e0f..7024b1d 100644 --- a/pom.xml +++ b/pom.xml @@ -286,41 +286,35 @@ org.springframework.data - spring-data-mongodb + spring-data-cassandra 3.0.9.RELEASE compile org.springframework.data - spring-data-redis - 2.3.9.RELEASE + spring-data-elasticsearch + 4.0.9.RELEASE compile org.springframework.data - spring-data-cassandra + spring-data-mongodb 3.0.9.RELEASE compile - - org.springframework.session - spring-session-core - ${springframework.session.version} + org.springframework.data + spring-data-redis + 2.3.9.RELEASE compile + org.springframework.session - spring-session-data-redis + spring-session-core ${springframework.session.version} compile - - org.springframework.session - spring-session-data-mongodb - 2.3.2.RELEASE - compile - org.springframework.session spring-session-hazelcast @@ -339,6 +333,18 @@ ${springframework.session.version} compile + + org.springframework.session + spring-session-data-mongodb + 2.3.2.RELEASE + compile + + + org.springframework.session + spring-session-data-redis + ${springframework.session.version} + compile + From c1164cb6e39e3dfe78e67fcc03351ef2c110cfe7 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Fri, 9 Jun 2023 22:59:48 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20org.jetbrains:annotati?= =?UTF-8?q?ons=20=E3=80=81amqp-client?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 7024b1d..85bd917 100644 --- a/pom.xml +++ b/pom.xml @@ -507,6 +507,11 @@ compile + + org.jetbrains + annotations + 16.0.3 + org.jetbrains.kotlin kotlin-stdlib @@ -611,6 +616,12 @@ ${mongodb.version} + + com.rabbitmq + amqp-client + 5.17.0 + + org.apache.velocity From 27b8ac544ba53d2ee25ffbe726c2563885701145 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Thu, 3 Aug 2023 12:29:09 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20kafka=E3=80=81rabbitmq?= =?UTF-8?q?=20=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- pom.xml | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e11dd88..8a83f49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ Buession Parent Changelog - 引入 [apache httpcomponents httpasyncclient](http://hc.apache.org/httpcomponents-asyncclient) - 引入 [apache httpcomponents httpcore-nio](http://hc.apache.org/httpcomponents-core-ga) -- 引入 [pache httpcomponents httpclient-cache](http://hc.apache.org/httpcomponents-client-ga) +- 引入 [apache httpcomponents httpclient-cache](http://hc.apache.org/httpcomponents-client-ga) - 引入 [apache httpcomponents 5](https://hc.apache.org/httpcomponents-client-5.2.x/) - 引入 [mysql-connector-j](http://dev.mysql.com/doc/connector-j/en/) - 引入 [mongodb-driver-sync](https://www.mongodb.com/) @@ -33,6 +33,7 @@ Buession Parent Changelog - 引入 [commons-text](https://commons.apache.org/proper/commons-text) - 引入 [commons-jexl3](https://commons.apache.org/proper/commons-jexl/) - 引入 [objectweb asm](http://asm.ow2.io/) +- 引入 [rabbitmq amqp-client](https://www.rabbitmq.com) ### 漏洞修复 diff --git a/pom.xml b/pom.xml index 85bd917..fd620df 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,8 @@ 4.5.7 3.1 1.19.4 + 2.8.2 + 4.9.4 4.9.0 4.1.89.Final 2.14.2 @@ -616,11 +618,38 @@ ${mongodb.version} + + org.apache.kafka + kafka-clients + ${kafka.version} + + + org.apache.kafka + kafka-streams + ${kafka.version} + + + + org.apache.rocketmq + rocketmq-client + ${rocketmq.version} + + + org.apache.rocketmq + rocketmq-acl + ${rocketmq.version} + + com.rabbitmq amqp-client 5.17.0 + + com.rabbitmq + http-client + 5.0.0 + @@ -763,6 +792,12 @@ org.apache.httpcomponents httpclient 4.5.14 + + + commons-logging + commons-logging + + org.apache.httpcomponents From be6e639cfae2172cc435bedab6472f8be2eee66c Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Tue, 15 Aug 2023 14:40:31 +0800 Subject: [PATCH 9/9] Release 2.3.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a83f49..21594fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Buession Parent Changelog =========================== -## [2.3.0](https://github.com/buession/buession-parent/releases/tag/v2.3.0) (2023-xx-xx) +## [2.3.0](https://github.com/buession/buession-parent/releases/tag/v2.3.0) (2023-08-15) ### 🔨依赖升级 - [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.18