8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2026-01-08 07:32:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #441 from didi/dev

Browse Source 
bump springboot version to 2.1.18 and ignore springframework version …
This commit is contained in:
EricZeng
2022-01-18 14:42:18 +08:00
committed by GitHub
parent a7f8c3ced3 10a27bc29c
commit 3336de457a
11 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kafka-manager-common/pom.xml
View File

@@ -21,15 +21,12 @@
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<file_encoding>UTF-8</file_encoding> <file_encoding>UTF-8</file_encoding>
<spring-version>5.1.3.RELEASE</spring-version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
<!-- http --> <!-- http -->

2
kafka-manager-console/src/container/admin/cluster-list/index.tsx
View File

@@ -295,7 +295,7 @@ export class ClusterList extends SearchAndFilterContainer {
cancelText="取消" cancelText="取消"
okText="确认" okText="确认"
> >
<Tooltip placement="left" title="暂停监控将无法正常监控指标信息，建议开启监控"> <Tooltip placement="bottom" title="暂停监控将无法正常监控指标信息，建议开启监控">
<a <a
className="action-button" className="action-button"
> >

2
kafka-manager-console/src/container/header/index.tsx
View File

@@ -145,7 +145,7 @@ export const Header = observer((props: IHeader) => {
<div className="left-content"> <div className="left-content">
<img className="kafka-header-icon" src={logoUrl} alt="" /> <img className="kafka-header-icon" src={logoUrl} alt="" />
<span className="kafka-header-text">LogiKM</span> <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>
<div className="mid-content"> <div className="mid-content">

3
kafka-manager-core/pom.xml
View File

@@ -24,7 +24,6 @@
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<file_encoding>UTF-8</file_encoding> <file_encoding>UTF-8</file_encoding>
<spring-version>5.1.3.RELEASE</spring-version>
</properties> </properties>
<dependencies> <dependencies>
@@ -38,12 +37,10 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
<!-- javax --> <!-- javax -->

4
kafka-manager-extends/kafka-manager-kcm/pom.xml
View File

@@ -28,7 +28,6 @@
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<file_encoding>UTF-8</file_encoding> <file_encoding>UTF-8</file_encoding>
<spring-version>5.1.3.RELEASE</spring-version>
</properties> </properties>
<dependencies> <dependencies>
@@ -56,17 +55,14 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId> <artifactId>spring-beans</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
<dependency> <dependency>

3
kafka-manager-extends/kafka-manager-monitor/pom.xml
View File

@@ -25,7 +25,6 @@
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<file_encoding>UTF-8</file_encoding> <file_encoding>UTF-8</file_encoding>
<spring-version>5.1.3.RELEASE</spring-version>
</properties> </properties>
<dependencies> <dependencies>
@@ -63,12 +62,10 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId> <artifactId>spring-beans</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
kafka-manager-extends/kafka-manager-notify/pom.xml
View File

@@ -25,7 +25,6 @@
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<file_encoding>UTF-8</file_encoding> <file_encoding>UTF-8</file_encoding>
<spring-version>5.1.3.RELEASE</spring-version>
</properties> </properties>
<dependencies> <dependencies>
@@ -48,7 +47,6 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
kafka-manager-extends/kafka-manager-openapi/pom.xml
View File

@@ -24,7 +24,6 @@
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<file_encoding>UTF-8</file_encoding> <file_encoding>UTF-8</file_encoding>
<spring-version>5.1.3.RELEASE</spring-version>
</properties> </properties>
<description> <description>
@@ -46,7 +45,6 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
kafka-manager-task/pom.xml
View File

@@ -24,7 +24,6 @@
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<file_encoding>UTF-8</file_encoding> <file_encoding>UTF-8</file_encoding>
<spring-version>5.1.3.RELEASE</spring-version>
</properties> </properties>
<dependencies> <dependencies>
@@ -52,7 +51,6 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

15
kafka-manager-web/pom.xml
View File

@@ -16,8 +16,6 @@
<properties> <properties>
<java_source_version>1.8</java_source_version> <java_source_version>1.8</java_source_version>
<java_target_version>1.8</java_target_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>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<tomcat.version>8.5.72</tomcat.version> <tomcat.version>8.5.72</tomcat.version>
<log4j2.version>2.16.0</log4j2.version> <log4j2.version>2.16.0</log4j2.version>
@@ -73,22 +71,22 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>${springframework.boot.version}</version> <version>${spring.boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId> <artifactId>spring-boot-starter-aop</artifactId>
<version>${springframework.boot.version}</version> <version>${spring.boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId> <artifactId>spring-boot-starter-logging</artifactId>
<version>${springframework.boot.version}</version> <version>${spring.boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-thymeleaf</artifactId>
<version>${springframework.boot.version}</version> <version>${spring.boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@@ -105,18 +103,17 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
<version>${spring-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>kafka-manager</finalName> <finalName>kafka-manager</finalName>
<plugins> <plugins>
<plugin>
<plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${springframework.boot.version}</version> <version>${spring.boot.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

5
pom.xml
View File

@@ -11,12 +11,13 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.1.RELEASE</version> <!-- 莫要修改该版本, 否则可能会导致自自定义的schedule不生效 --> <version>2.1.18.RELEASE</version> <!-- 莫要修改该版本, 否则可能会导致自自定义的schedule不生效 -->
<!--<relativePath/>--> <!--<relativePath/>-->
</parent> </parent>
<properties> <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> <swagger2.version>2.9.2</swagger2.version>
<swagger.version>1.5.21</swagger.version> <swagger.version>1.5.21</swagger.version>