From 093ba5b389e61f20e36d46ca1c34e24b5cd3a7ce Mon Sep 17 00:00:00 2001
From: tucke <tucke@qq.com>
Date: 星期一, 26 十月 2020 09:53:58 +0800
Subject: [PATCH] 误修改，回退
---
pom.xml | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9ef7c4f..a90ef5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,30 +6,31 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
- <ruoyi.version>3.1.0</ruoyi.version>
+ <ruoyi.version>3.2.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>
- <mybatis.boot.version>1.3.2</mybatis.boot.version>
- <druid.version>1.1.14</druid.version>
+ <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+ <druid.version>1.2.1</druid.version>
<bitwalker.version>1.19</bitwalker.version>
<swagger.version>2.9.2</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
- <pagehelper.boot.version>1.2.5</pagehelper.boot.version>
- <fastjson.version>1.2.73</fastjson.version>
- <oshi.version>3.9.1</oshi.version>
+ <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
+ <fastjson.version>1.2.74</fastjson.version>
+ <oshi.version>5.2.5</oshi.version>
+ <jna.version>5.5.0</jna.version>
<commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<poi.version>3.17</poi.version>
<velocity.version>1.7</velocity.version>
- <jwt.version>0.9.0</jwt.version>
+ <jwt.version>0.9.1</jwt.version>
</properties>
<!-- 依赖声明 -->
@@ -40,7 +41,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.1.1.RELEASE</version>
+ <version>2.1.17.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -72,6 +73,18 @@
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>${jna.version}</version>
+ </dependency>
<!-- swagger2-->
<dependency>
--
Gitblit v1.9.2