From bdebca94b3d5cbc61772289248b839973303891b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 22 九月 2021 12:38:52 +0800
Subject: [PATCH] remove 移除无用合并
---
pom.xml | 84 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5d46d4e..73d680a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,14 @@
<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>
+ <swagger-annotations.version>1.5.22</swagger-annotations.version>
<poi.version>4.1.2</poi.version>
- <easyexcel.version>2.2.10</easyexcel.version>
+ <easyexcel.version>2.2.11</easyexcel.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3.3</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.11</hutool.version>
+ <hutool.version>5.7.13</hutool.version>
<feign.version>3.0.3</feign.version>
<feign-okhttp.version>11.6</feign-okhttp.version>
<okhttp.version>4.9.1</okhttp.version>
@@ -35,6 +36,9 @@
<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>
@@ -73,6 +77,18 @@
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>swagger-annotations</artifactId>
+ <groupId>io.swagger</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger-annotations.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
@@ -86,6 +102,16 @@
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
@@ -136,6 +162,12 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${feign.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>feign-core</artifactId>
+ <groupId>io.github.openfeign</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -239,7 +271,12 @@
<dependencies>
-
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -318,47 +355,8 @@
<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>
--
Gitblit v1.9.3