diff --git a/pom.xml b/pom.xml index 341ac76b..e3c71aa2 100644 --- a/pom.xml +++ b/pom.xml @@ -41,14 +41,10 @@ <elasticsearch.version>7.14.0</elasticsearch.version> <skywalking-toolkit.version>8.13.0</skywalking-toolkit.version> - <!-- alibaba 相关依赖 --> - <sentinel.version>1.8.6</sentinel.version> - <seata.version>1.6.1</seata.version> - <nacos.version>2.2.0</nacos.version> - <dubbo.version>3.1.3</dubbo.version> - <!-- 临时修复 snakeyaml 漏洞 --> <snakeyaml.version>1.33</snakeyaml.version> + <!-- 临时修复 fastjson 漏洞 --> + <fastjson.version>1.2.83</fastjson.version> <!-- OSS 配置 --> <aws-java-sdk-s3.version>1.12.349</aws-java-sdk-s3.version> @@ -342,6 +338,12 @@ <version>${snakeyaml.version}</version> </dependency> + <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 876355f1..941c55b5 100644 --- a/ruoyi-common/ruoyi-common-dubbo/pom.xml +++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml @@ -15,18 +15,6 @@ 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> @@ -56,10 +44,6 @@ <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> </exclusion> - <exclusion> - <groupId>com.alibaba.fastjson2</groupId> - <artifactId>fastjson2</artifactId> - </exclusion> <exclusion> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> @@ -67,22 +51,6 @@ </exclusions> </dependency> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.alibaba.fastjson2</groupId> - <artifactId>fastjson2</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 8413ec27..5af69bc2 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -15,18 +15,6 @@ 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 --> @@ -38,34 +26,11 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>*</artifactId> </exclusion> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> <exclusion> <groupId>com.alibaba</groupId> <artifactId>druid</artifactId> </exclusion> - <exclusion> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - </exclusion> </exclusions> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>druid</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - <scope>provided</scope> - </dependency> </dependencies> </project> diff --git a/ruoyi-common/ruoyi-common-sentinel/pom.xml b/ruoyi-common/ruoyi-common-sentinel/pom.xml index 6a6c8387..ad768df9 100644 --- a/ruoyi-common/ruoyi-common-sentinel/pom.xml +++ b/ruoyi-common/ruoyi-common-sentinel/pom.xml @@ -19,19 +19,6 @@ <dependency> <groupId>com.alibaba.cloud</groupId> <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId> - <exclusions> - <exclusion> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - <version>1.2.83</version> - <scope>provided</scope> </dependency> <!-- Sentinel Datasource Nacos --> diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml index 5dc915e7..c7890452 100644 --- a/ruoyi-visual/ruoyi-nacos/pom.xml +++ b/ruoyi-visual/ruoyi-nacos/pom.xml @@ -27,6 +27,7 @@ <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 6addb0a0..e1995333 100644 --- a/ruoyi-visual/ruoyi-seata-server/pom.xml +++ b/ruoyi-visual/ruoyi-seata-server/pom.xml @@ -27,6 +27,7 @@ <packaging>jar</packaging> <properties> + <seata.version>1.6.1</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 5e4abe4b..3eeaf1ae 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,7 +94,6 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>${fastjson.version}</version> </dependency> </dependencies>