From 71c52e6dd7e10a14c80972adce8bded997b181b9 Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao@didiglobal.com>
Date: Mon, 17 Jan 2022 21:18:06 +0800
Subject: [PATCH] bump springboot version to 2.1.18 and ignore springframework
 version config

---
 kafka-manager-common/pom.xml                        | 3 ---
 kafka-manager-core/pom.xml                          | 3 ---
 kafka-manager-extends/kafka-manager-kcm/pom.xml     | 4 ----
 kafka-manager-extends/kafka-manager-monitor/pom.xml | 3 ---
 kafka-manager-extends/kafka-manager-notify/pom.xml  | 2 --
 kafka-manager-extends/kafka-manager-openapi/pom.xml | 2 --
 kafka-manager-task/pom.xml                          | 2 --
 kafka-manager-web/pom.xml                           | 4 ++--
 pom.xml                                             | 2 +-
 9 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/kafka-manager-common/pom.xml b/kafka-manager-common/pom.xml
index f6c33def..f784bf8d 100644
--- a/kafka-manager-common/pom.xml
+++ b/kafka-manager-common/pom.xml
@@ -21,15 +21,12 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-
-        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${spring-version}</version>
         </dependency>
 
         <!-- http -->
diff --git a/kafka-manager-core/pom.xml b/kafka-manager-core/pom.xml
index 81675a43..e00663ed 100644
--- a/kafka-manager-core/pom.xml
+++ b/kafka-manager-core/pom.xml
@@ -24,7 +24,6 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
 
     <dependencies>
@@ -38,12 +37,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${spring-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring-version}</version>
         </dependency>
 
         <!-- javax -->
diff --git a/kafka-manager-extends/kafka-manager-kcm/pom.xml b/kafka-manager-extends/kafka-manager-kcm/pom.xml
index 7ffd00e3..12a942d5 100644
--- a/kafka-manager-extends/kafka-manager-kcm/pom.xml
+++ b/kafka-manager-extends/kafka-manager-kcm/pom.xml
@@ -28,7 +28,6 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
 
     <dependencies>
@@ -56,17 +55,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${spring-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring-version}</version>
         </dependency>
 
         <dependency>
diff --git a/kafka-manager-extends/kafka-manager-monitor/pom.xml b/kafka-manager-extends/kafka-manager-monitor/pom.xml
index 0948a190..9f04b7c9 100644
--- a/kafka-manager-extends/kafka-manager-monitor/pom.xml
+++ b/kafka-manager-extends/kafka-manager-monitor/pom.xml
@@ -25,7 +25,6 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
 
     <dependencies>
@@ -63,12 +62,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${spring-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/kafka-manager-extends/kafka-manager-notify/pom.xml b/kafka-manager-extends/kafka-manager-notify/pom.xml
index a2fd2c4b..348164eb 100644
--- a/kafka-manager-extends/kafka-manager-notify/pom.xml
+++ b/kafka-manager-extends/kafka-manager-notify/pom.xml
@@ -25,7 +25,6 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
 
     <dependencies>
@@ -48,7 +47,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/kafka-manager-extends/kafka-manager-openapi/pom.xml b/kafka-manager-extends/kafka-manager-openapi/pom.xml
index caaa1242..cc6f3316 100644
--- a/kafka-manager-extends/kafka-manager-openapi/pom.xml
+++ b/kafka-manager-extends/kafka-manager-openapi/pom.xml
@@ -24,7 +24,6 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
 
     <description>
@@ -46,7 +45,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/kafka-manager-task/pom.xml b/kafka-manager-task/pom.xml
index 8927ef8e..dce8d3c8 100644
--- a/kafka-manager-task/pom.xml
+++ b/kafka-manager-task/pom.xml
@@ -24,7 +24,6 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
 
     <dependencies>
@@ -52,7 +51,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/kafka-manager-web/pom.xml b/kafka-manager-web/pom.xml
index 91b09fc5..2308c6f8 100644
--- a/kafka-manager-web/pom.xml
+++ b/kafka-manager-web/pom.xml
@@ -16,8 +16,8 @@
     <properties>
         <java_source_version>1.8</java_source_version>
         <java_target_version>1.8</java_target_version>
-        <springframework.boot.version>2.1.1.RELEASE</springframework.boot.version>
-        <spring-version>5.1.3.RELEASE</spring-version>
+        <springframework.boot.version>2.1.18.RELEASE</springframework.boot.version>
+        <spring-version>5.1.19.RELEASE</spring-version>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <tomcat.version>8.5.72</tomcat.version>
         <log4j2.version>2.16.0</log4j2.version>
diff --git a/pom.xml b/pom.xml
index e790bfd3..7c0831b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.1.RELEASE</version>  <!-- 莫要修改该版本, 否则可能会导致自自定义的schedule不生效 -->
+        <version>2.1.18.RELEASE</version>  <!-- 莫要修改该版本, 否则可能会导致自自定义的schedule不生效 -->
         <!--<relativePath/>-->
     </parent>