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 1/3] 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>
 

From e2744ab3990225fe8ec998b484ddf5a9c8ac2b09 Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao@didiglobal.com>
Date: Tue, 18 Jan 2022 14:00:20 +0800
Subject: [PATCH 2/3] bump version to 2.6.0

---
 kafka-manager-web/pom.xml | 15 ++++++---------
 pom.xml                   |  3 ++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/kafka-manager-web/pom.xml b/kafka-manager-web/pom.xml
index 2308c6f8..80ccdfe1 100644
--- a/kafka-manager-web/pom.xml
+++ b/kafka-manager-web/pom.xml
@@ -16,8 +16,6 @@
     <properties>
         <java_source_version>1.8</java_source_version>
         <java_target_version>1.8</java_target_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>
@@ -73,22 +71,22 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${springframework.boot.version}</version>
+            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
-            <version>${springframework.boot.version}</version>
+            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-logging</artifactId>
-            <version>${springframework.boot.version}</version>
+            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
-            <version>${springframework.boot.version}</version>
+            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -105,18 +103,17 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
-            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 
     <build>
         <finalName>kafka-manager</finalName>
         <plugins>
-            <plugin>
 
+            <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${springframework.boot.version}</version>
+                <version>${spring.boot.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/pom.xml b/pom.xml
index 7c0831b9..8b8db3a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
     </parent>
 
     <properties>
-        <kafka-manager.revision>2.5</kafka-manager.revision>
+        <kafka-manager.revision>2.6.0</kafka-manager.revision>
+        <spring.boot.version>2.1.18.RELEASE</spring.boot.version>
         <swagger2.version>2.9.2</swagger2.version>
         <swagger.version>1.5.21</swagger.version>
 

From 859cf74bd646e39693277d9b6990c320d6662987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=B6=85?= <joysunchao@didiglobal.com>
Date: Tue, 18 Jan 2022 14:05:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?2.6.0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/container/admin/cluster-list/index.tsx                  | 2 +-
 kafka-manager-console/src/container/header/index.tsx            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-manager-console/src/container/admin/cluster-list/index.tsx b/kafka-manager-console/src/container/admin/cluster-list/index.tsx
index be6956d6..cdd197fa 100644
--- a/kafka-manager-console/src/container/admin/cluster-list/index.tsx
+++ b/kafka-manager-console/src/container/admin/cluster-list/index.tsx
@@ -295,7 +295,7 @@ export class ClusterList extends SearchAndFilterContainer {
                 cancelText="取消"
                 okText="确认"
               >
-                <Tooltip placement="left" title="暂停监控将无法正常监控指标信息，建议开启监控">
+                <Tooltip placement="bottom" title="暂停监控将无法正常监控指标信息，建议开启监控">
                   <a
                     className="action-button"
                   >
diff --git a/kafka-manager-console/src/container/header/index.tsx b/kafka-manager-console/src/container/header/index.tsx
index d0b8febe..8d90e3f0 100644
--- a/kafka-manager-console/src/container/header/index.tsx
+++ b/kafka-manager-console/src/container/header/index.tsx
@@ -145,7 +145,7 @@ export const Header = observer((props: IHeader) => {
       <div className="left-content">
         <img className="kafka-header-icon" src={logoUrl} alt="" />
         <span className="kafka-header-text">LogiKM</span>
-        <a className='kafka-header-version' href="https://github.com/didi/Logi-KafkaManager/releases" target='_blank'>v2.5.0</a>
+        <a className='kafka-header-version' href="https://github.com/didi/Logi-KafkaManager/releases" target='_blank'>v2.6.0</a>
         {/* 添加版本超链接 */}
       </div>
       <div className="mid-content">