diff --git a/pom.xml b/pom.xml index 82880081..2354044a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,6 @@ <p6spy.version>3.9.1</p6spy.version> <dynamic-ds.version>3.5.2</dynamic-ds.version> <velocity.version>2.3</velocity.version> - <fastjson.version>1.2.83</fastjson.version> <swagger.core.version>2.2.7</swagger.core.version> <springdoc.version>1.6.14</springdoc.version> <poi.version>5.2.3</poi.version> @@ -42,8 +41,12 @@ <elasticsearch.version>7.14.0</elasticsearch.version> <skywalking-toolkit.version>8.13.0</skywalking-toolkit.version> - <!-- 统一 guava 版本 解决隐式漏洞问题 --> - <guava.version>31.1-jre</guava.version> + <!-- alibaba 相关依赖 --> + <sentinel.version>1.8.6</sentinel.version> + <seata.version>1.6.0</seata.version> + <nacos.version>2.2.0</nacos.version> + <dubbo.version>3.1.3</dubbo.version> + <!-- 临时修复 snakeyaml 漏洞 --> <snakeyaml.version>1.33</snakeyaml.version> @@ -332,13 +335,6 @@ <version>${tencent.sms.version}</version> </dependency> - <!-- 统一 guava 版本 解决隐式漏洞问题 --> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> - <!-- 临时修复 snakeyaml 漏洞 --> <dependency> <groupId>org.yaml</groupId> @@ -346,13 +342,6 @@ <version>${snakeyaml.version}</version> </dependency> - <!-- 统一 fastjson 版本 解决alibaba组件序列化漏洞问题 --> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - <version>${fastjson.version}</version> - </dependency> - </dependencies> </dependencyManagement> diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/ruoyi-common/ruoyi-common-dubbo/pom.xml index 65b1a1cb..876355f1 100644 --- a/ruoyi-common/ruoyi-common-dubbo/pom.xml +++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml @@ -15,6 +15,18 @@ ruoyi-common-dubbo </description> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-dependencies-bom</artifactId> + <version>${dubbo.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>com.ruoyi</groupId> @@ -58,13 +70,11 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.83</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.alibaba.fastjson2</groupId> <artifactId>fastjson2</artifactId> - <version>2.0.14</version> <scope>provided</scope> </dependency> <dependency> diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 95b2ad31..8413ec27 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -15,6 +15,18 @@ ruoyi-common-seata 分布式事务 </description> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>io.seata</groupId> + <artifactId>seata-dependencies</artifactId> + <version>${seata.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- SpringBoot Seata --> @@ -48,13 +60,11 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>druid</artifactId> - <version>1.2.6</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.83</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml index c7890452..5dc915e7 100644 --- a/ruoyi-visual/ruoyi-nacos/pom.xml +++ b/ruoyi-visual/ruoyi-nacos/pom.xml @@ -27,7 +27,6 @@ <packaging>jar</packaging> <properties> - <nacos.version>2.2.0</nacos.version> <nacos.lib.path>${project.basedir}/src/main/resources/lib</nacos.lib.path> </properties> diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml index 578f8862..6addb0a0 100644 --- a/ruoyi-visual/ruoyi-seata-server/pom.xml +++ b/ruoyi-visual/ruoyi-seata-server/pom.xml @@ -27,7 +27,6 @@ <packaging>jar</packaging> <properties> - <seata.version>1.6.0</seata.version> <jcommander.version>1.72</jcommander.version> <druid.version>1.2.12</druid.version> </properties> diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml index 3eeaf1ae..5e4abe4b 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml @@ -13,8 +13,8 @@ <packaging>jar</packaging> <properties> - <sentinel.version>1.8.6</sentinel.version> <curator.version>4.0.1</curator.version> + <fastjson.version>1.2.83</fastjson.version> </properties> <dependencies> @@ -94,6 +94,7 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> + <version>${fastjson.version}</version> </dependency> </dependencies> diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml index 08961b38..52efd3ad 100644 --- a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml @@ -9,21 +9,6 @@ <artifactId>ruoyi-xxl-job-admin</artifactId> <packaging>jar</packaging> - <properties> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>${spring-boot.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <!-- SpringCloud Alibaba Nacos --> <dependency>