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 | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4886172..300a82d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.6.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.2.13.RELEASE</version>
+ <version>2.5.5</version>
<relativePath />
</parent>
@@ -24,11 +24,11 @@
<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>2.1.4</mybatis.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.10.0</commons.io.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>
@@ -36,8 +36,8 @@
<kaptcha.version>2.3.2</kaptcha.version>
<swagger.version>3.0.0</swagger.version>
<poi.version>4.1.2</poi.version>
- <oshi.version>5.7.4</oshi.version>
- <jna.version>5.8.0</jna.version>
+ <oshi.version>5.8.2</oshi.version>
+ <jna.version>5.9.0</jna.version>
<velocity.version>1.7</velocity.version>
</properties>
@@ -119,6 +119,12 @@
<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>
<!-- 甯哥敤宸ュ叿绫� -->
@@ -266,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>
@@ -277,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