From cb4f51faccb680cf4a0f43fff208467cafb9882c Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 22 Oct 2023 15:12:32 +0800
Subject: [PATCH] :arrow_up: Upgrading dependencies. druid 1.2.20 &
 mybatis-plus-join 1.4.6 & sharding 5.4.1

---
 pigx-common/pigx-common-bom/pom.xml                           | 4 ++--
 ...ringframework.boot.autoconfigure.AutoConfiguration.imports | 1 -
 pigx-visual/pigx-jimu-platform/pom.xml                        | 2 +-
 pom.xml                                                       | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 57c7a4f1a..5f293496b 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -19,9 +19,9 @@
     <properties>
         <pigx.version>5.2.0</pigx.version>
         <mybatis-plus.version>3.5.3.2</mybatis-plus.version>
-        <mybatis-plus-join.version>1.4.5</mybatis-plus-join.version>
+        <mybatis-plus-join.version>1.4.6</mybatis-plus-join.version>
         <dynamic-ds.version>4.1.3</dynamic-ds.version>
-        <druid.version>1.2.19</druid.version>
+        <druid.version>1.2.20</druid.version>
         <hutool.version>5.8.21</hutool.version>
         <mysql.connector.version>8.0.32</mysql.connector.version>
         <oracle.version>21.3.0.0</oracle.version>
diff --git a/pigx-common/pigx-common-data/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pigx-common/pigx-common-data/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index bed40a558..adf555324 100644
--- a/pigx-common/pigx-common-data/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/pigx-common/pigx-common-data/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -7,4 +7,3 @@ com.pig4cloud.pigx.common.data.tenant.TenantContextHolderFilter
 com.pig4cloud.pigx.common.data.tenant.PigxTenantConfiguration
 com.pig4cloud.pigx.common.data.mybatis.MybatisPlusConfiguration
 com.pig4cloud.pigx.common.data.resolver.TenantKeyStrResolver
-com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure
diff --git a/pigx-visual/pigx-jimu-platform/pom.xml b/pigx-visual/pigx-jimu-platform/pom.xml
index c0632b0f7..29ec79cbf 100755
--- a/pigx-visual/pigx-jimu-platform/pom.xml
+++ b/pigx-visual/pigx-jimu-platform/pom.xml
@@ -13,7 +13,7 @@
 
     <description>积木报表系统</description>
     <properties>
-        <druid.version>1.2.19</druid.version>
+        <druid.version>1.2.20</druid.version>
         <spring-boot-dependencies.version>2.7.16</spring-boot-dependencies.version>
         <spring-cloud.version>2021.0.8</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
diff --git a/pom.xml b/pom.xml
index 382f75c30..4ef1a8bb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     </organization>
 
     <properties>
-        <spring-boot.version>3.1.4</spring-boot.version>
+        <spring-boot.version>3.1.5</spring-boot.version>
         <spring-cloud.version>2022.0.4</spring-cloud.version>
         <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>