From d56d7022351ec2e4cccd6639091c24b41c4b7779 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 14 十月 2021 16:22:54 +0800
Subject: [PATCH] 升级oshi到最新版本v5.8.2
---
pom.xml | 107 +++++++++++++++++++++++++++--------------------------
1 files changed, 55 insertions(+), 52 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc4fde5..300a82d 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.7.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.5.5</version>
<relativePath />
</parent>
@@ -24,19 +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>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
- <bitwalker.version>1.19</bitwalker.version>
+ <mybatis.spring.boot.starter.version>2.2.0</mybatis.spring.boot.starter.version>
+ <pagehelper.spring.boot.starter.version>1.4.0</pagehelper.spring.boot.starter.version>
+ <fastjson.version>1.2.78</fastjson.version>
+ <druid.version>1.2.8</druid.version>
+ <commons.io.version>2.11.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>2.9.2</swagger.version>
- <poi.version>3.17</poi.version>
- <oshi.version>5.2.5</oshi.version>
- <jna.version>5.5.0</jna.version>
+ <swagger.version>3.0.0</swagger.version>
+ <poi.version>4.1.2</poi.version>
+ <oshi.version>5.8.2</oshi.version>
+ <jna.version>5.9.0</jna.version>
<velocity.version>1.7</velocity.version>
</properties>
@@ -113,27 +114,33 @@
<version>${pagehelper.spring.boot.starter.version}</version>
</dependency>
- <!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+ <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
- <!--甯哥敤宸ュ叿绫� -->
+ <!-- 鑷畾涔夐獙璇佹敞瑙� -->
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
+ <!-- 甯哥敤宸ュ叿绫� -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
- <!--io甯哥敤宸ュ叿绫� -->
+ <!-- io甯哥敤宸ュ叿绫� -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
- <!--鏂囦欢涓婁紶宸ュ叿绫� -->
+ <!-- 鏂囦欢涓婁紶宸ュ叿绫� -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -154,55 +161,38 @@
<version>${fastjson.version}</version>
</dependency>
- <!--Spring妗嗘灦鍩烘湰鐨勬牳蹇冨伐鍏�-->
+ <!-- Spring妗嗘灦鍩烘湰鐨勬牳蹇冨伐鍏�-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
- <!--Token鐢熸垚涓庤В鏋�-->
+ <!-- Token鐢熸垚涓庤В鏋�-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
- <!-- swagger2-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--闃叉杩涘叆swagger椤甸潰鎶ョ被鍨嬭浆鎹㈤敊璇紝鎺掗櫎2.9.2涓殑寮曠敤锛屾墜鍔ㄥ鍔�1.5.21鐗堟湰-->
+ <!-- Swagger3渚濊禆 -->
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.5.21</version>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>${swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- 闃叉杩涘叆swagger椤甸潰鎶ョ被鍨嬭浆鎹㈤敊璇紝鎺掗櫎3.0.0涓殑寮曠敤锛屾墜鍔ㄥ鍔�1.6.2鐗堟湰 -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
- <version>1.5.21</version>
+ <version>1.6.2</version>
</dependency>
-
- <!-- swagger2-UI-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
<!-- 鑾峰彇绯荤粺淇℃伅 -->
<dependency>
@@ -218,11 +208,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>
<!-- 瀹氭椂浠诲姟 -->
@@ -237,7 +240,7 @@
</exclusions>
</dependency>
- <!--楠岃瘉鐮� -->
+ <!-- 楠岃瘉鐮� -->
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
@@ -269,7 +272,7 @@
<repository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -280,7 +283,7 @@
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
--
Gitblit v1.9.3