From 55d7a0ea6eadbc7e5d34204539f560a1ba98db58 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Sat, 30 Jul 2022 22:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 basic-pojo/pom.xml         | 22 +---------------------
 common/pom.xml             | 11 +++++++++++
 module-file/pom.xml        |  1 -
 pom.xml                    |  6 +++---
 service-department/pom.xml |  1 +
 service-group/pom.xml      |  2 +-
 6 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/basic-pojo/pom.xml b/basic-pojo/pom.xml
index a7ab003d..5f0429ed 100644
--- a/basic-pojo/pom.xml
+++ b/basic-pojo/pom.xml
@@ -24,32 +24,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-expression</artifactId>
-                </exclusion>
-            </exclusions>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-expression</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <!-- spring end -->
 
diff --git a/common/pom.xml b/common/pom.xml
index f8d109a9..62a44302 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -67,6 +67,17 @@
         </dependency>
         <!-- gson end -->
 
+        <!-- spring start -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+        </dependency>
+        <!-- spring end -->
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/module-file/pom.xml b/module-file/pom.xml
index 58dc8620..6ee8efac 100644
--- a/module-file/pom.xml
+++ b/module-file/pom.xml
@@ -32,7 +32,6 @@
             <artifactId>minio</artifactId>
         </dependency>
         <!-- minio end -->
-
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c48ec4e8..e30f4847 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <properties>
         <java.version>1.8</java.version>
         <spring.version>5.3.20</spring.version>
-        <spring-security.version>5.2.9.RELEASE</spring-security.version>
+        <spring-security.version>5.7.2</spring-security.version>
         <spring-boot.version>2.7.0</spring-boot.version>
         <fastjson.version>1.2.83</fastjson.version>
         <fastjson2.version>2.0.2</fastjson2.version>
@@ -97,14 +97,14 @@
         <oshi-core.version>3.9.1</oshi-core.version>
         <jna.version>5.5.0</jna.version>
         <jna-platform.version>5.5.0</jna-platform.version>
-        <netty.version>4.1.71.Final</netty.version>
+        <netty.version>4.1.77.Final</netty.version>
         <bouncycastle.version>1.69</bouncycastle.version>
         <tomcat-embed.version>9.0.58</tomcat-embed.version>
         <lombok.version>1.18.16</lombok.version>
         <slf4j.version>1.7.30</slf4j.version>
         <activiti.version>6.0.0</activiti.version>
         <xmlgraphics.version>1.10</xmlgraphics.version>
-        <minio.version>8.2.1</minio.version>
+        <minio.version>8.2.2</minio.version>
         <mongo.version>3.4.0</mongo.version>
         <redis.version>2.5.5</redis.version>
     </properties>
diff --git a/service-department/pom.xml b/service-department/pom.xml
index fe4fad8b..b755380d 100644
--- a/service-department/pom.xml
+++ b/service-department/pom.xml
@@ -17,6 +17,7 @@
             <groupId>ink.wgink</groupId>
             <artifactId>module-dictionary</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>ink.wgink</groupId>
diff --git a/service-group/pom.xml b/service-group/pom.xml
index c3fc8bd7..d6507550 100644
--- a/service-group/pom.xml
+++ b/service-group/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>ink.wgink</groupId>
-            <artifactId>service-user</artifactId>
+            <artifactId>common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>