From d38d66931d702a4be7f88bba243ec1a142f3612f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 27 七月 2021 11:36:06 +0800
Subject: [PATCH] 升级oshi到最新版本v5.8.0
---
pom.xml | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index c07c413..034011f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.5.0</version>
+ <version>3.6.0</version>
<packaging>jar</packaging>
<name>ruoyi</name>
@@ -25,19 +25,19 @@
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.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>
+ <pagehelper.spring.boot.starter.version>1.3.1</pagehelper.spring.boot.starter.version>
<fastjson.version>1.2.76</fastjson.version>
<druid.version>1.2.6</druid.version>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
+ <commons.io.version>2.10.0</commons.io.version>
+ <commons.fileupload.version>1.4</commons.fileupload.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>3.0.0</swagger.version>
<poi.version>4.1.2</poi.version>
- <oshi.version>5.6.0</oshi.version>
- <jna.version>5.7.0</jna.version>
+ <oshi.version>5.8.0</oshi.version>
+ <jna.version>5.8.0</jna.version>
<velocity.version>1.7</velocity.version>
</properties>
@@ -172,11 +172,13 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
+ <version>${swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- 闃叉杩涘叆swagger椤甸潰鎶ョ被鍨嬭浆鎹㈤敊璇紝鎺掗櫎3.0.0涓殑寮曠敤锛屾墜鍔ㄥ鍔�1.6.2鐗堟湰 -->
--
Gitblit v1.9.3