From 2eaa52c7aa74e1b87c84af9e37004adb289395ad Mon Sep 17 00:00:00 2001
From: huyikai <928489257@qq.com>
Date: Fri, 13 May 2022 14:54:40 +0800
Subject: [PATCH] Unexpected use of comma operator
---
pom.xml | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc2f97e..356fd7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,23 +6,23 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.3.0</version>
+ <version>3.5.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.3.0</ruoyi.version>
+ <ruoyi.version>3.5.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <spring-boot.version>2.6.2</spring-boot.version>
- <spring-cloud.version>2021.0.0</spring-cloud.version>
- <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
- <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
- <spring-boot-admin.version>2.6.0</spring-boot-admin.version>
- <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
+ <spring-boot.version>2.6.7</spring-boot.version>
+ <spring-cloud.version>2021.0.1</spring-cloud.version>
+ <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
+ <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
+ <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
+ <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
<swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version>
@@ -33,13 +33,12 @@
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<velocity.version>2.3</velocity.version>
- <fastjson.version>1.2.79</fastjson.version>
+ <fastjson.version>1.2.80</fastjson.version>
<jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
<commons-collections.version>3.2.2</commons-collections.version>
<transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
- <log4j2.version>2.17.1</log4j2.version>
</properties>
<!-- 依赖声明 -->
@@ -181,19 +180,6 @@
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>${transmittable-thread-local.version}</version>
- </dependency>
-
- <!-- log4j日志组件 -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j2.version}</version>
</dependency>
<!-- 核心模块 -->
--
Gitblit v1.9.3