optimize: optimize pom dependencies (apache#4924)

conghuhu · Sep 9, 2022 · 1c2d50a · 1c2d50a
1 parent ed308dd
commit 1c2d50a
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 1 deletion.
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -33,6 +33,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#4490](https://github.com/seata/seata/pull/4490)] tccfence log table delete by index
 - [[#4911](https://github.com/seata/seata/pull/4911)] add license checker workflow
 - [[#4917](https://github.com/seata/seata/pull/4917)] upgrade package-lock.json fix vulnerabilities
+- [[#4924](https://github.com/seata/seata/pull/4924)] optimize pom dependencies
 
 ### test:
 - [[#4794](https://github.com/seata/seata/pull/4794)] try to fix the test `DataSourceProxyTest.getResourceIdTest()`
@@ -53,5 +54,6 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [Bughue](https://github.com/Bughue)
 - [AlbumenJ](https://github.com/AlbumenJ)
 - [doubleDimple](https://github.com/doubleDimple)
+- [jsbxyyx](https://github.com/jsbxyyx)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
@@ -32,6 +32,7 @@
 - [[#4490](https://github.com/seata/seata/pull/4490)] tccfence 记录表优化成按索引删除
 - [[#4911](https://github.com/seata/seata/pull/4911)] 添加 header 和license 检测
 - [[#4917](https://github.com/seata/seata/pull/4917)] 升级 package-lock.json 修复漏洞
+- [[#4924](https://github.com/seata/seata/pull/4924)] 优化 pom 依赖
 
 ### test：
 - [[#4794](https://github.com/seata/seata/pull/4794)] 重构代码，尝试修复单元测试 `DataSourceProxyTest.getResourceIdTest()`
@@ -52,5 +53,6 @@
 - [Bughue](https://github.com/Bughue)
 - [AlbumenJ](https://github.com/AlbumenJ)
 - [doubleDimple](https://github.com/doubleDimple)
+- [jsbxyyx](https://github.com/jsbxyyx)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git a/integration/brpc/pom.xml b/integration/brpc/pom.xml
@@ -45,6 +45,7 @@
                     <artifactId>protobuf-java</artifactId>
                 </exclusion>
             </exclusions>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/integration/dubbo-alibaba/pom.xml b/integration/dubbo-alibaba/pom.xml
@@ -39,6 +39,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml
@@ -45,14 +45,17 @@
                     <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -63,6 +66,7 @@
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

diff --git a/integration/hsf/pom.xml b/integration/hsf/pom.xml
@@ -38,6 +38,7 @@
         <dependency>
             <groupId>com.alibaba.edas</groupId>
             <artifactId>edas-sdk</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

diff --git a/integration/http/pom.xml b/integration/http/pom.xml
@@ -39,6 +39,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -48,6 +49,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/integration/motan/pom.xml b/integration/motan/pom.xml
@@ -39,10 +39,12 @@
         <dependency>
             <groupId>com.weibo</groupId>
             <artifactId>motan-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.weibo</groupId>
             <artifactId>motan-transport-netty</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/integration/sofa-rpc/pom.xml b/integration/sofa-rpc/pom.xml
@@ -38,6 +38,7 @@
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-all</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/script/config-center/config.txt b/script/config-center/config.txt
@@ -65,7 +65,7 @@ tcc.fence.cleanPeriod=1h
 #Log rule configuration, for client and server
 log.exceptionRate=100
 
-#Transaction storage configuration, only for the server. The file, DB, and redis configuration values are optional.
+#Transaction storage configuration, only for the server. The file, db, and redis configuration values are optional.
 store.mode=file
 store.lock.mode=file
 store.session.mode=file

diff --git a/seata-spring-boot-starter/pom.xml b/seata-spring-boot-starter/pom.xml
@@ -47,6 +47,12 @@
             </exclusions>
         </dependency>
         <!--spring-->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>