From 9ae1d6808d1f20871e80f8a471fe02c5766e51c3 Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Sun, 15 Oct 2023 11:26:52 +0800
Subject: [PATCH 1/2] Refactor spring dependencies

---
 spring/boot-starter/pom.xml |  3 +--
 spring/core/pom.xml         | 23 ++--------------------
 spring/namespace/pom.xml    | 38 ++++++++-----------------------------
 spring/pom.xml              |  6 ++++++
 4 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/spring/boot-starter/pom.xml b/spring/boot-starter/pom.xml
index eeab8a741c..dfbd074fe2 100644
--- a/spring/boot-starter/pom.xml
+++ b/spring/boot-starter/pom.xml
@@ -32,6 +32,7 @@
             <artifactId>elasticjob-engine-spring-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -55,7 +56,6 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -65,7 +65,6 @@
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/spring/core/pom.xml b/spring/core/pom.xml
index 73be5f0aab..cd2d479050 100644
--- a/spring/core/pom.xml
+++ b/spring/core/pom.xml
@@ -38,6 +38,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
@@ -45,31 +46,11 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+        
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/spring/namespace/pom.xml b/spring/namespace/pom.xml
index 250a0191e0..a51a6a2247 100644
--- a/spring/namespace/pom.xml
+++ b/spring/namespace/pom.xml
@@ -33,21 +33,6 @@
             <version>${project.parent.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>
             <artifactId>elasticjob-error-handler-email</artifactId>
@@ -68,31 +53,25 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-test</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>spring-context-support</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <scope>test</scope>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-test</artifactId>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -106,7 +85,6 @@
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/spring/pom.xml b/spring/pom.xml
index e343358d7f..ec75e56cc5 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -57,6 +57,12 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context-support</artifactId>
                 <version>${springframework.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-context</artifactId>
+                    </exclusion>
+                </exclusions>
                 <scope>provided</scope>
             </dependency>
             <dependency>

From cf9552aed67f9e2265ee8c75661d88d98cac74f4 Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Sun, 15 Oct 2023 11:30:26 +0800
Subject: [PATCH 2/2] Refactor spring dependencies

---
 spring/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring/pom.xml b/spring/pom.xml
index ec75e56cc5..581f0dc97e 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -57,13 +57,13 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context-support</artifactId>
                 <version>${springframework.version}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.springframework</groupId>
                         <artifactId>spring-context</artifactId>
                     </exclusion>
                 </exclusions>
-                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>