From b6f21f451d4ed02c644dd1bfb7c457ed2e0cfe80 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 30 Dec 2021 14:48:33 +0800
Subject: [PATCH] 升级log4j2到2.17.1，防止漏洞风险
---
pom.xml | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index c063301..0154633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,22 +6,22 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>3.2.0</ruoyi.version>
+ <ruoyi.version>3.3.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.5.5</spring-boot.version>
+ <spring-boot.version>2.5.8</spring-boot.version>
<spring-cloud.version>2020.0.4</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.5.2</spring-boot-admin.version>
+ <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
<spring-boot.mybatis>2.2.0</spring-boot.mybatis>
<swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.6.2</swagger.core.version>
@@ -29,15 +29,18 @@
<kaptcha.version>2.3.2</kaptcha.version>
<pagehelper.boot.version>1.4.0</pagehelper.boot.version>
<druid.version>1.2.8</druid.version>
- <dynamic-ds.version>3.4.1</dynamic-ds.version>
+ <dynamic-ds.version>3.5.0</dynamic-ds.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
- <velocity.version>1.7</velocity.version>
- <fastjson.version>1.2.78</fastjson.version>
+ <velocity.version>2.3</velocity.version>
+ <fastjson.version>1.2.79</fastjson.version>
+ <jjwt.version>0.9.1</jjwt.version>
<minio.version>8.2.2</minio.version>
<poi.version>4.1.2</poi.version>
<common-pool.version>2.10.0</common-pool.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>
<!-- 依赖声明 -->
@@ -149,14 +152,8 @@
<!-- 代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Collection 增强Java集合框架 -->
@@ -173,6 +170,20 @@
<version>${fastjson.version}</version>
</dependency>
+ <!-- JWT -->
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>${jjwt.version}</version>
+ </dependency>
+
+ <!-- 线程传递值 -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
+ <version>${transmittable-thread-local.version}</version>
+ </dependency>
+
<!-- 公共资源池 -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -180,6 +191,19 @@
<version>${common-pool.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>
+
<!-- 核心模块 -->
<dependency>
<groupId>com.ruoyi</groupId>
--
Gitblit v1.9.3