From 426a8267d4e908ae5f0fc2196642e1b6327fe909 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 30 十月 2022 09:57:09 +0800
Subject: [PATCH] 升级pagehelper到最新版1.4.5
---
pom.xml | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 401a5b2..1366bb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.7.0</version>
+ <version>3.8.4</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.5.5</version>
+ <version>2.5.14</version>
<relativePath />
</parent>
@@ -24,10 +24,10 @@
<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.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>
+ <mybatis.spring.boot.starter.version>2.2.2</mybatis.spring.boot.starter.version>
+ <pagehelper.spring.boot.starter.version>1.4.5</pagehelper.spring.boot.starter.version>
+ <fastjson.version>2.0.16</fastjson.version>
+ <druid.version>1.2.11</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>
@@ -36,9 +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.8.2</oshi.version>
- <jna.version>5.9.0</jna.version>
- <velocity.version>1.7</velocity.version>
+ <oshi.version>6.3.0</oshi.version>
+ <velocity.version>2.3</velocity.version>
</properties>
<dependencies>
@@ -156,8 +155,8 @@
<!-- 闃块噷JSON瑙ｆ瀽鍣� -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
<version>${fastjson.version}</version>
</dependency>
@@ -172,6 +171,12 @@
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
+ </dependency>
+
+ <!-- Jaxb -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
</dependency>
<!-- Swagger3渚濊禆 -->
@@ -211,14 +216,8 @@
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- collections宸ュ叿绫� -->
--
Gitblit v1.9.3