From 45d32a59c5264d08e8926fc620b263c0ca4da8d2 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Tue, 20 Sep 2022 09:57:08 +0800
Subject: [PATCH] jars update

---
 ReleaseNotes.txt                              | 11 ++++++++++
 gradle.properties                             | 22 +++++++++----------
 .../maxkey-web-app/src/app/shared/consts.ts   |  2 +-
 .../src/app/shared/consts.ts                  |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index ba64d0eed..fd52dccd6 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -22,6 +22,17 @@
         springcloud             3.1.4
         micrometercore          1.9.4
         prometheus              0.16.0
+        log4j                   2.19.0
+        gson                    2.9.1
+        tink                    1.7.0
+        druid                   1.2.12
+        druidspringbootstarter  1.2.12
+        mybatis                 3.5.11
+        nimbusjosejwt           9.25
+        jodatime                2.11.1
+        jsoup                   1.15.3
+        passay                  1.6.2
+        ip2region               2.6.5
     
 MaxKey v 3.5.6 GA 2022/09/07
     *(MAXKEY-221101) 解决springcloud JAR包冲突问题
diff --git a/gradle.properties b/gradle.properties
index 28e0623ea..5e98a8445 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -54,7 +54,7 @@ velocitydepVersion              =1.4
 freemarkerVersion               =2.3.31
 xmlbeansVersion                 =5.0.2
 commonscompressVersion          =1.20
-log4jVersion                    =2.18.0
+log4jVersion                    =2.19.0
 kafkaclientsVersion             =2.8.1
 rocketmqclientVersion           =4.9.4
 rocketmqspringbootVersion       =2.2.2
@@ -79,9 +79,9 @@ alibabanacosclientVersion  		=2.0.4
 jibGradlePluginVersion          =3.1.4
 jhlabsfiltersVersion            =2.0.235-1
 kaptchaVersion                  =2.3.2
-gsonVersion                     =2.9.0
+gsonVersion                     =2.9.1
 guavaVersion                    =31.1-jre
-tinkVersion                     =1.6.1
+tinkVersion                     =1.7.0
 zxingcoreVersion                =3.5.0
 concurrentlinkedhashmaplruVersion =1.4.2
 #jboss
@@ -94,11 +94,11 @@ knife4jVersion                  =3.0.3
 #database
 postgresqlVersion               =42.4.0
 mysqlconnectorjavaVersion       =8.0.29
-druidVersion                    =1.2.11
-druidspringbootstarterVersion   =1.2.11
+druidVersion                    =1.2.12
+druidspringbootstarterVersion   =1.2.12
 jedisVersion                    =4.2.3
 caffeineVersion                 =2.9.3
-mybatisVersion                  =3.5.10
+mybatisVersion                  =3.5.11
 mybatisspringVersion            =2.0.7
 #saml
 opensamlVersion                 =2.6.6
@@ -121,7 +121,7 @@ bouncycastleVersion             =1.69
 junitVersion                    =4.11
 mockitoallVersion               =1.10.19
 xmlunitVersion                  =1.6
-nimbusjosejwtVersion            =9.16.1
+nimbusjosejwtVersion            =9.25
 jcipannotationsVersion          =1.0
 minidevjsonsmartVersion         =2.3
 minidevasmVersion               =1.0.2
@@ -149,7 +149,7 @@ reactornettyVersion             =1.0.21
 reactorextraVersion             =3.4.8
 szxcvbnVersion                  =0.2
 quartzVersion                   =2.3.2
-jodatimeVersion                 =2.10.14
+jodatimeVersion                 =2.11.1
 snakeyamlVersion                =1.30
 nekohtmlVersion                 =1.9.22
 ognlVersion                     =3.3.3
@@ -160,7 +160,7 @@ aspectjtoolsVersion             =1.9.4
 evictorVersion                  =1.0.0
 lettuceVersion                  =6.1.9.RELEASE
 pinyin4jVersion                 =2.5.1
-jsoupVersion                    =1.15.2
+jsoupVersion                    =1.15.3
 reflectionsVersion              =0.10.2
 #xml
 jdomVersion                     =2.0.2
@@ -170,13 +170,13 @@ xmlresolverVersion              =1.2
 xmlsecVersion                   =1.5.8
 xpp3Version                     =1.1.6
 xstreamVersion                  =1.4.10
-passayVersion                   =1.6.1
+passayVersion                   =1.6.2
 micrometercoreVersion           =1.9.4
 prometheusVersion               =0.16.0
 LatencyUtilsVersion             =2.0.3
 stax2apiVersion                 =4.2.1
 mapstructVersion                =1.4.1.Final
-ip2regionVersion                =2.6.4
+ip2regionVersion                =2.6.5
 #sdk
 aliyunjavasdkcoreVersion        =4.5.1
 tencentcloudsdkjavaVersion      =3.1.33
diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts b/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts
index 938077c16..7ab0af2ee 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts
@@ -26,5 +26,5 @@ export const CONSTS = {
   REDIRECT_URI: 'redirect_uri',
   REMEMBER: 'remember_me',
   TOKEN: '_token',
-  VERSION: 'v3.5.6 GA'
+  VERSION: 'v3.5.7 GA'
 };
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts
index 1722bb347..86167dfdc 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts
@@ -19,5 +19,5 @@ export const CONSTS = {
     INST: 'inst',
     REDIRECT_URI: 'redirect_uri',
     REMEMBER: 'remember',
-    VERSION: 'v3.5.6 GA'
+    VERSION: 'v3.5.7 GA'
 };