From f80f0e35f348005d4657f4008ef9cd24861b1ab9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 06 五月 2021 20:31:02 +0800
Subject: [PATCH] 添加新群号：201396349
---
pom.xml | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index f57599d..b30cb98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.1.0</version>
+ <version>3.4.0</version>
<packaging>jar</packaging>
<name>ruoyi</name>
@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.1.17.RELEASE</version>
+ <version>2.2.13.RELEASE</version>
<relativePath />
</parent>
@@ -24,18 +24,20 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
- <pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
- <fastjson.version>1.2.73</fastjson.version>
- <druid.version>1.1.22</druid.version>
+ <mybatis.spring.boot.starter.version>2.1.4</mybatis.spring.boot.starter.version>
+ <pagehelper.spring.boot.starter.version>1.3.0</pagehelper.spring.boot.starter.version>
+ <fastjson.version>1.2.75</fastjson.version>
+ <druid.version>1.2.4</druid.version>
<commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
- <bitwalker.version>1.19</bitwalker.version>
+ <commons.collections.version>3.2.2</commons.collections.version>
+ <bitwalker.version>1.21</bitwalker.version>
<jwt.version>0.9.1</jwt.version>
<kaptcha.version>2.3.2</kaptcha.version>
<swagger.version>2.9.2</swagger.version>
- <poi.version>3.17</poi.version>
- <oshi.version>3.9.1</oshi.version>
+ <poi.version>4.1.2</poi.version>
+ <oshi.version>5.6.0</oshi.version>
+ <jna.version>5.7.0</jna.version>
<velocity.version>1.7</velocity.version>
</properties>
@@ -210,16 +212,6 @@
<version>${oshi.version}</version>
</dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- </dependency>
-
<!-- excel宸ュ叿 -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -227,11 +219,24 @@
<version>${poi.version}</version>
</dependency>
- <!--velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
+ <!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- collections宸ュ叿绫� -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons.collections.version}</version>
</dependency>
<!-- 瀹氭椂浠诲姟 -->
--
Gitblit v1.9.3