From 9342bbef5659a43114193a725a96ad852eec7a79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 九月 2021 23:39:27 +0800
Subject: [PATCH] fix 修复合并错误
---
pom.xml | 77 +++++++++++---------------------------
1 files changed, 23 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index 02f046c..6d1836c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,40 +6,43 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>2.6.0</version>
+ <version>3.1.0</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>2.6.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.3</spring-boot.version>
+ <ruoyi-vue-plus.version>3.1.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.4</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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>
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<druid.version>1.2.6</druid.version>
<knife4j.version>3.0.3</knife4j.version>
<poi.version>4.1.2</poi.version>
<easyexcel.version>2.2.10</easyexcel.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.3</mybatis-plus.version>
+ <mybatis-plus.version>3.4.3.3</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.7</hutool.version>
+ <hutool.version>5.7.11</hutool.version>
<feign.version>3.0.3</feign.version>
- <feign-okhttp.version>11.2</feign-okhttp.version>
+ <feign-okhttp.version>11.6</feign-okhttp.version>
<okhttp.version>4.9.1</okhttp.version>
- <spring-boot-admin.version>2.5.0</spring-boot-admin.version>
- <redisson.version>3.16.1</redisson.version>
+ <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
+ <redisson.version>3.16.2</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
<dynamic-ds.version>3.4.1</dynamic-ds.version>
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <jaxb.version>3.0.1</jaxb.version>
+
<!-- OSS 閰嶇疆 -->
<qiniu.version>7.8.0</qiniu.version>
- <aliyun.oss.version>3.13.0</aliyun.oss.version>
- <qcloud.cos.version>5.6.47</qcloud.cos.version>
+ <aliyun.oss.version>3.13.1</aliyun.oss.version>
+ <qcloud.cos.version>5.6.51</qcloud.cos.version>
<minio.version>8.3.0</minio.version>
<!-- docker 閰嶇疆 -->
@@ -48,7 +51,7 @@
<docker.namespace>ruoyi</docker.namespace>
<docker.plugin.version>1.2.2</docker.plugin.version>
</properties>
-
+
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
@@ -239,7 +242,12 @@
<dependencies>
-
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -318,48 +326,9 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
- <endpoints.include>health,info</endpoints.include>
+ <endpoints.include>health, info, logfile</endpoints.include>
</properties>
- </profile>
-
- <!-- jdk澶氱増鏈厤缃� -->
- <profile>
- <id>jdk8</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>1.8</jdk>
- </activation>
- <properties>
- <java.version>1.8</java.version>
- </properties>
- </profile>
- <profile>
- <id>jdk11</id>
- <activation>
- <jdk>11</jdk>
- </activation>
- <properties>
- <java.version>11</java.version>
- <jaxb.version>3.0.1</jaxb.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <!-- jdk11 缂哄け渚濊禆 jaxb-->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <!--jaxb-->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
--
Gitblit v1.9.3