From f611e96a7c0e8ebf520aa8bf128e13486bc7a2c8 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Fri, 18 Nov 2022 11:48:51 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E8=87=B3=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ pom.xml | 45 ++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0470fc..9caff54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,35 @@ Buession Parent Changelog =========================== +## [2.1.2](https://github.com/buession/buession-parent/releases/tag/v2.1.1) (2022-11-xx) + +### 🔨依赖升级 + +- [druid](https://github.com/alibaba/druid) 版本升级至 1.2.15 +- [fasterxml jackson](http://github.com/FasterXML/jackson) 版本升级至 2.14.0 +- [gson](https://mvnrepository.com/artifact/com.google.code.gson/gson) 版本升级至 2.10 +- [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.12 +- [io.micrometer](https://github.com/micrometer-metrics/micrometer) 版本升级至 1.10.1 +- [joda-time](https://www.joda.org/joda-time/) 版本升级至 2.12.1 +- [tomcat-jdbc](https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-jdbc) 版本升级至 10.1.2 +- [checker-qual](https://github.com/typetools/checker-framework) 版本升级至 3.27.0 +- [kotlin](https://kotlinlang.org/) 版本升级至 1.7.21 +- [mapstruct](http://mapstruct.org/mapstruct/) 版本升级至 1.5.3.Final +- [mongodb driver core](https://www.mongodb.com/) 版本升级至 4.8.0 +- [mybatis](http://www.mybatis.org/mybatis-3) 版本升级至 3.5.11 +- [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) 版本升级至 1.33 +- [jedis](https://github.com/redis/jedis) 版本升级至 4.3.1 +- [apache shiro](https://github.com/apache/shiro) 版本升级至 1.10.0 + + +### 漏洞修复 + +- [apache shiro](https://github.com/apache/shiro) 修复 [CVE-2022-40664](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40664) 漏洞 + + +--- + + ## [2.1.2](https://github.com/buession/buession-parent/releases/tag/v2.1.1) (2022-08-25) ### 🔨依赖升级 diff --git a/pom.xml b/pom.xml index 3c40c47..0c8635d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ parent https://github.com/buession/buession-parent Buession Parent - 2.1.2 + 2.2.0 pom @@ -47,34 +47,29 @@ 1.8 1.8 1.8 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 5.2.22.RELEASE 2.3.12.RELEASE 5.3.13.RELEASE 2.5.1.RELEASE 2.2 - 1.7.10 - 4.6.1 + 1.7.21 + 4.8.0 4.10.0 - 1.9.1 + 1.10.0 4.5.6 3.1 1.19.4 - 2.13.3 - 2.13.3 - 2.13.3 - 2.13.3 - 2.13.3 + 2.14.0 + 2.14.0 + 2.14.0 + 2.14.0 + 2.14.0 1.4.0 - 1.9.3 - 4.2.11 + 1.10.1 + 4.2.12 1.9.9.1 1.70 - 1.5.2.Final + 1.5.3.Final 1.7.36 2.18.0 @@ -465,7 +460,7 @@ org.apache.tomcat tomcat-jdbc - 10.0.23 + 10.1.2 compile @@ -483,14 +478,14 @@ com.alibaba druid - 1.2.11 + 1.2.15 compile org.mybatis mybatis - 3.5.10 + 3.5.11 compile @@ -642,7 +637,7 @@ redis.clients jedis - 4.2.3 + 4.3.1 compile @@ -655,7 +650,7 @@ joda-time joda-time - 2.10.14 + 2.12.1 com.fasterxml @@ -670,7 +665,7 @@ org.checkerframework checker-qual - 3.24.0 + 3.27.0 cglib @@ -987,7 +982,7 @@ org.yaml snakeyaml - 1.30 + 1.33 @@ -1114,7 +1109,7 @@ com.google.code.gson gson - 2.9.1 + 2.10 From cbe3b0a923f6e39e6875dd53cf2ce37c6a64e876 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Tue, 7 Feb 2023 21:55:58 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=9A=E4=B9=89=20maven=20properties:=20?= =?UTF-8?q?project.build.sourceEncoding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 0c8635d..4b011a1 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ + UTF-8 UTF-8 1.8 1.8 From fc5340c32af818a8d53a03749c133ffce03a343b Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Tue, 14 Feb 2023 00:29:09 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b011a1..682eb22 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,6 @@ 2.14.0 2.14.0 2.14.0 - 1.4.0 1.10.1 4.2.12 1.9.9.1 @@ -167,6 +166,12 @@ ${springframework.version} compile + + org.springframework + spring-websocket + ${springframework.version} + compile + org.springframework spring-test @@ -404,6 +409,12 @@ 4.0.4 compile + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 2.3.6 + compile + jakarta.transaction jakarta.transaction-api @@ -738,6 +749,11 @@ ${org.bouncycastle.version} + + com.sun.jersey + jersey-core + ${sun.jersey.version} + com.sun.jersey jersey-json @@ -754,6 +770,11 @@ + + com.sun.jersey + jersey-server + ${sun.jersey.version} + com.sun.jersey.contribs jersey-apache-client4 From ba6fe8f9eb5b9ee3f813056d58a91ad64363cac9 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Wed, 15 Feb 2023 23:04:30 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 9 ++++- pom.xml | 108 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9caff54..4d74d6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ Buession Parent Changelog - [druid](https://github.com/alibaba/druid) 版本升级至 1.2.15 - [fasterxml jackson](http://github.com/FasterXML/jackson) 版本升级至 2.14.0 - [gson](https://mvnrepository.com/artifact/com.google.code.gson/gson) 版本升级至 2.10 -- [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.12 +- [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.15 - [io.micrometer](https://github.com/micrometer-metrics/micrometer) 版本升级至 1.10.1 - [joda-time](https://www.joda.org/joda-time/) 版本升级至 2.12.1 - [tomcat-jdbc](https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-jdbc) 版本升级至 10.1.2 @@ -23,6 +23,13 @@ Buession Parent Changelog - [apache shiro](https://github.com/apache/shiro) 版本升级至 1.10.0 +### ⭐ 新特性 + +- 引入 [mysql-connector-java](http://dev.mysql.com/doc/connector-j/en/) +- 引入 [mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) +- 引入 [netty](https://netty.io/) + + ### 漏洞修复 - [apache shiro](https://github.com/apache/shiro) 修复 [CVE-2022-40664](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40664) 漏洞 diff --git a/pom.xml b/pom.xml index 682eb22..d84c883 100644 --- a/pom.xml +++ b/pom.xml @@ -54,19 +54,21 @@ 2.5.1.RELEASE 2.2 1.7.21 - 4.8.0 4.10.0 1.10.0 4.5.6 3.1 1.19.4 + 4.8.0 + 4.1.89.Final 2.14.0 2.14.0 2.14.0 2.14.0 2.14.0 + 1.9.13 1.10.1 - 4.2.12 + 4.2.15 1.9.9.1 1.70 1.5.3.Final @@ -442,7 +444,7 @@ jakarta.ws.rs jakarta.ws.rs-api - 3.0.0 + 2.1.6 compile @@ -519,6 +521,18 @@ compile + + mysql + mysql-connector-java + 8.0.23 + + + + com.microsoft.sqlserver + mssql-jdbc + 11.2.3.jre8 + + org.mongodb mongodb-driver-core @@ -593,6 +607,17 @@ commons-lang3 3.12.0 + + commons-configuration + commons-configuration + 1.10 + + + commons-logging + commons-logging + + + org.apache.commons commons-collections4 @@ -640,12 +665,48 @@ commons-beanutils 1.9.4 + + commons-io + commons-io + 2.11.0 + commons-codec commons-codec 1.15 + + io.netty + netty-all + ${netty.version} + + + io.netty + netty-handler + ${netty.version} + + + io.netty + netty-handler-proxy + ${netty.version} + + + io.netty + netty-codec-http + ${netty.version} + + + io.netty + netty-codec-http2 + ${netty.version} + + + io.netty + netty-transport-native-epoll + ${netty.version} + + redis.clients jedis @@ -753,11 +814,23 @@ com.sun.jersey jersey-core ${sun.jersey.version} + + + javax.ws.rs + jsr311-api + + com.sun.jersey jersey-json ${sun.jersey.version} + + + javax.xml.bind + jaxb-api + + com.sun.jersey @@ -1122,6 +1195,29 @@ + + + org.codehaus.jackson + jackson-core-asl + ${codehaus.jackson.version} + + + org.codehaus.jackson + jackson-mapper-asl + ${codehaus.jackson.version} + + + org.codehaus.jackson + jackson-jaxrs + ${codehaus.jackson.version} + + + org.codehaus.jackson + jackson-xc + ${codehaus.jackson.version} + + + com.alibaba fastjson @@ -1175,6 +1271,12 @@ ${slf4j.version} compile + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + compile + org.apache.logging.log4j From 1ae1881831046ab22255ad7caf91a4e0942f1c61 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Thu, 16 Feb 2023 13:17:26 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20&&=20=E5=A2=9E=E5=8A=A0=20commons-*=20?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 +++--- pom.xml | 20 +++++++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d74d6c..4a74236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ Buession Parent Changelog - [druid](https://github.com/alibaba/druid) 版本升级至 1.2.15 - [fasterxml jackson](http://github.com/FasterXML/jackson) 版本升级至 2.14.0 -- [gson](https://mvnrepository.com/artifact/com.google.code.gson/gson) 版本升级至 2.10 +- [gson](https://mvnrepository.com/artifact/com.google.code.gson/gson) 版本升级至 2.11 - [io.dropwizard.metrics](https://mvnrepository.com/search?q=io.dropwizard.metrics) 版本升级至 4.2.15 - [io.micrometer](https://github.com/micrometer-metrics/micrometer) 版本升级至 1.10.1 - [joda-time](https://www.joda.org/joda-time/) 版本升级至 2.12.1 @@ -20,7 +20,7 @@ Buession Parent Changelog - [mybatis](http://www.mybatis.org/mybatis-3) 版本升级至 3.5.11 - [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) 版本升级至 1.33 - [jedis](https://github.com/redis/jedis) 版本升级至 4.3.1 -- [apache shiro](https://github.com/apache/shiro) 版本升级至 1.10.0 +- [apache shiro](https://github.com/apache/shiro) 版本升级至 1.11.0 ### ⭐ 新特性 @@ -32,7 +32,7 @@ Buession Parent Changelog ### 漏洞修复 -- [apache shiro](https://github.com/apache/shiro) 修复 [CVE-2022-40664](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40664) 漏洞 +- [apache shiro](https://github.com/apache/shiro) 修复 [CVE-2022-40664](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40664) 、 [CVE-2022-41853](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-41853) 、 [CVE-2022-41853](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-41853) 漏洞 --- diff --git a/pom.xml b/pom.xml index d84c883..031d5b6 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.2 1.7.21 4.10.0 - 1.10.0 + 1.11.0 4.5.6 3.1 1.19.4 @@ -650,6 +650,11 @@ 4.5.13 + + commons-codec + commons-codec + 1.15 + commons-attributes commons-attributes-api @@ -665,15 +670,20 @@ commons-beanutils 1.9.4 + + commons-digester + commons-digester + 2.1 + commons-io commons-io 2.11.0 - commons-codec - commons-codec - 1.15 + commons-cli + commons-cli + 1.5.0 @@ -1227,7 +1237,7 @@ com.google.code.gson gson - 2.10 + 2.10.1 From eae8e499400c8ba6fa050708f96e5443f01230c9 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Thu, 16 Feb 2023 23:15:01 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20jersey-guice?= 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 031d5b6..b9755a7 100644 --- a/pom.xml +++ b/pom.xml @@ -674,6 +674,12 @@ commons-digester commons-digester 2.1 + + + commons-logging + commons-logging + + commons-io @@ -863,6 +869,11 @@ jersey-apache-client4 ${sun.jersey.version} + + com.sun.jersey.contribs + jersey-guice + ${sun.jersey.version} + com.squareup.okhttp3 From f58d5087e73d3b04fef805299a33df137a23c5de Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Sat, 25 Feb 2023 22:26:35 +0800 Subject: [PATCH 7/9] =?UTF-8?q?spring-security-rsa=20=E6=8E=92=E9=99=A4=20?= =?UTF-8?q?spring-core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index b9755a7..1f3081d 100644 --- a/pom.xml +++ b/pom.xml @@ -315,6 +315,12 @@ org.springframework.security spring-security-rsa 1.0.11.RELEASE + + + org.springframework + spring-core + + org.springframework.security From 6ab2b373121802f1f910fc808baadc71ca73967a Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Mon, 27 Feb 2023 22:18:47 +0800 Subject: [PATCH 8/9] =?UTF-8?q?add=20netty=20=E4=BE=9D=E8=B5=96=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 1f3081d..2bfee62 100644 --- a/pom.xml +++ b/pom.xml @@ -703,6 +703,11 @@ netty-all ${netty.version} + + io.netty + netty-common + ${netty.version} + io.netty netty-handler @@ -723,6 +728,11 @@ netty-codec-http2 ${netty.version} + + io.netty + netty-transport + ${netty.version} + io.netty netty-transport-native-epoll From 8d88310c469ea54db6e4c9c6f94e2a957ceb8046 Mon Sep 17 00:00:00 2001 From: "Yong.Teng" Date: Mon, 27 Feb 2023 22:23:14 +0800 Subject: [PATCH 9/9] release 2.2.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a74236..99ba00b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Buession Parent Changelog =========================== -## [2.1.2](https://github.com/buession/buession-parent/releases/tag/v2.1.1) (2022-11-xx) +## [2.1.2](https://github.com/buession/buession-parent/releases/tag/v2.1.1) (2023-02-27) ### 🔨依赖升级