From 48ae89e2631318f792cdf48ea76f9b523ce21aee Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Tue, 23 Nov 2021 04:39:18 +0000
Subject: [PATCH] fix: 00_framework/core/pom.xml & 00_framework/pom.xml to
 reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-CHQOSLOGBACK-1726923
- https://snyk.io/vuln/SNYK-JAVA-CHQOSLOGBACK-31407
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-32236
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-1082234
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-1082236
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1017119
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1048292
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1061939
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1080637
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1080638
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1728264
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1728265
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1728266
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-1728268
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451342
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451343
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451458
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451459
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451503
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451504
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451505
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451508
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451510
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-451511
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-538488
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-570072
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-584427
- https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATE-1041788
- https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATE-568162
- https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATE-569100
- https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATE-584563
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-31689
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-32199
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-451604
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-460644
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-467268
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-72470
- https://snyk.io/vuln/SNYK-JAVA-ORGYAML-537645
---
 00_framework/core/pom.xml | 6 +++---
 00_framework/pom.xml      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/00_framework/core/pom.xml b/00_framework/core/pom.xml
index 863f08be..a253659a 100644
--- a/00_framework/core/pom.xml
+++ b/00_framework/core/pom.xml
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>
 			<artifactId>transport</artifactId>
-			<version>5.3.3</version>
+			<version>7.15.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -133,7 +133,7 @@
 		<dependency>
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
-			<version>4.1.3</version>
+			<version>5.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -156,7 +156,7 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-web</artifactId>
-			<version>3.0.3</version>
+			<version>4.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
diff --git a/00_framework/pom.xml b/00_framework/pom.xml
index 1f39fb69..6f80da7d 100644
--- a/00_framework/pom.xml
+++ b/00_framework/pom.xml
@@ -30,7 +30,7 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>1.5.9.RELEASE</version>
-		<relativePath />
+		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
 
@@ -39,7 +39,7 @@
 		<project.build.jdk_version>1.8</project.build.jdk_version>
 		<!-- spring -->
 		<spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
-		<spring-boot_version>1.5.9.RELEASE</spring-boot_version>
+		<spring-boot_version>2.3.0.RELEASE</spring-boot_version>
 		<!-- 数据库连接 -->
 		<druid_version>1.1.9</druid_version>
 		<mysql.version>8.0.11</mysql.version>