diff --git a/build.sh b/build.sh
index da5d20ef..03b1087e 100644
--- a/build.sh
+++ b/build.sh
@@ -4,8 +4,9 @@ cd $workspace
## constant
OUTPUT_DIR=./output
-KM_VERSION=2.1.0
-APP_NAME=kafka-manager-$KM_VERSION
+KM_VERSION=2.2.0
+APP_NAME=kafka-manager
+APP_DIR=${APP_NAME}-${KM_VERSION}
MYSQL_TABLE_SQL_FILE=./docs/install_guide/create_mysql_table.sql
CONFIG_FILE=./kafka-manager-web/src/main/resources/application.yml
@@ -28,15 +29,15 @@ function build() {
function make_output() {
# 新建output目录
rm -rf ${OUTPUT_DIR} &>/dev/null
- mkdir -p ${OUTPUT_DIR}/${APP_NAME} &>/dev/null
+ mkdir -p ${OUTPUT_DIR}/${APP_DIR} &>/dev/null
# 填充output目录, output内的内容
(
- cp -rf ${MYSQL_TABLE_SQL_FILE} ${OUTPUT_DIR}/${APP_NAME} && # 拷贝 sql 初始化脚本 至output目录
- cp -rf ${CONFIG_FILE} ${OUTPUT_DIR}/${APP_NAME} && # 拷贝 application.yml 至output目录
+ cp -rf ${MYSQL_TABLE_SQL_FILE} ${OUTPUT_DIR}/${APP_DIR} && # 拷贝 sql 初始化脚本 至output目录
+ cp -rf ${CONFIG_FILE} ${OUTPUT_DIR}/${APP_DIR} && # 拷贝 application.yml 至output目录
# 拷贝程序包到output路径
- cp kafka-manager-web/target/kafka-manager-web-${KM_VERSION}-SNAPSHOT.jar ${OUTPUT_DIR}/${APP_NAME}/${APP_NAME}-SNAPSHOT.jar
+ cp kafka-manager-web/target/kafka-manager-web-${KM_VERSION}-SNAPSHOT.jar ${OUTPUT_DIR}/${APP_DIR}/${APP_NAME}.jar
echo -e "make output ok."
) || { echo -e "make output error"; exit 2; } # 填充output目录失败后, 退出码为 非0
}
@@ -44,7 +45,7 @@ function make_output() {
function make_package() {
# 压缩output目录
(
- cd ${OUTPUT_DIR} && tar cvzf ${APP_NAME}.tar.gz ${APP_NAME}
+ cd ${OUTPUT_DIR} && tar cvzf ${APP_DIR}.tar.gz ${APP_DIR}
echo -e "make package ok."
) || { echo -e "make package error"; exit 2; } # 压缩output目录失败后, 退出码为 非0
}
diff --git a/docs/assets/images/common/Logi Kafka Manager架构图.png b/docs/assets/images/common/Logi Kafka Manager架构图.png
deleted file mode 100644
index 15932909..00000000
Binary files a/docs/assets/images/common/Logi Kafka Manager架构图.png and /dev/null differ
diff --git a/kafka-manager-common/pom.xml b/kafka-manager-common/pom.xml
index f310a81a..67fbcdbd 100644
--- a/kafka-manager-common/pom.xml
+++ b/kafka-manager-common/pom.xml
@@ -5,13 +5,13 @@
4.0.0
com.xiaojukeji.kafka
kafka-manager-common
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
diff --git a/kafka-manager-console/pom.xml b/kafka-manager-console/pom.xml
index 2339dabd..02ee7e1c 100644
--- a/kafka-manager-console/pom.xml
+++ b/kafka-manager-console/pom.xml
@@ -8,7 +8,7 @@
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
diff --git a/kafka-manager-core/pom.xml b/kafka-manager-core/pom.xml
index 2360dffd..81675a43 100644
--- a/kafka-manager-core/pom.xml
+++ b/kafka-manager-core/pom.xml
@@ -5,13 +5,13 @@
4.0.0
com.xiaojukeji.kafka
kafka-manager-core
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
diff --git a/kafka-manager-dao/pom.xml b/kafka-manager-dao/pom.xml
index 41122856..8b30c431 100644
--- a/kafka-manager-dao/pom.xml
+++ b/kafka-manager-dao/pom.xml
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
kafka-manager-dao
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
diff --git a/kafka-manager-extends/kafka-manager-account/pom.xml b/kafka-manager-extends/kafka-manager-account/pom.xml
index 3d129969..a3cb47fb 100644
--- a/kafka-manager-extends/kafka-manager-account/pom.xml
+++ b/kafka-manager-extends/kafka-manager-account/pom.xml
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
kafka-manager-account
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
../../pom.xml
diff --git a/kafka-manager-extends/kafka-manager-bpm/pom.xml b/kafka-manager-extends/kafka-manager-bpm/pom.xml
index 6a670849..c8ecf459 100644
--- a/kafka-manager-extends/kafka-manager-bpm/pom.xml
+++ b/kafka-manager-extends/kafka-manager-bpm/pom.xml
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
kafka-manager-bpm
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
../../pom.xml
diff --git a/kafka-manager-extends/kafka-manager-kcm/pom.xml b/kafka-manager-extends/kafka-manager-kcm/pom.xml
index 4e087dd1..741f0f12 100644
--- a/kafka-manager-extends/kafka-manager-kcm/pom.xml
+++ b/kafka-manager-extends/kafka-manager-kcm/pom.xml
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
kafka-manager-kcm
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
../../pom.xml
diff --git a/kafka-manager-extends/kafka-manager-monitor/pom.xml b/kafka-manager-extends/kafka-manager-monitor/pom.xml
index 9d198a49..0948a190 100644
--- a/kafka-manager-extends/kafka-manager-monitor/pom.xml
+++ b/kafka-manager-extends/kafka-manager-monitor/pom.xml
@@ -5,13 +5,13 @@
4.0.0
com.xiaojukeji.kafka
kafka-manager-monitor
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
../../pom.xml
diff --git a/kafka-manager-extends/kafka-manager-notify/pom.xml b/kafka-manager-extends/kafka-manager-notify/pom.xml
index c15dba32..a2fd2c4b 100644
--- a/kafka-manager-extends/kafka-manager-notify/pom.xml
+++ b/kafka-manager-extends/kafka-manager-notify/pom.xml
@@ -5,13 +5,13 @@
4.0.0
com.xiaojukeji.kafka
kafka-manager-notify
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
../../pom.xml
diff --git a/kafka-manager-extends/kafka-manager-openapi/pom.xml b/kafka-manager-extends/kafka-manager-openapi/pom.xml
index a0c4c277..caaa1242 100644
--- a/kafka-manager-extends/kafka-manager-openapi/pom.xml
+++ b/kafka-manager-extends/kafka-manager-openapi/pom.xml
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
kafka-manager-openapi
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
../../pom.xml
diff --git a/kafka-manager-task/pom.xml b/kafka-manager-task/pom.xml
index 86c06a99..8927ef8e 100644
--- a/kafka-manager-task/pom.xml
+++ b/kafka-manager-task/pom.xml
@@ -5,13 +5,13 @@
4.0.0
com.xiaojukeji.kafka
kafka-manager-task
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
diff --git a/kafka-manager-web/pom.xml b/kafka-manager-web/pom.xml
index f40e1c35..849eb304 100644
--- a/kafka-manager-web/pom.xml
+++ b/kafka-manager-web/pom.xml
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
kafka-manager-web
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
jar
kafka-manager
com.xiaojukeji.kafka
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
diff --git a/pom.xml b/pom.xml
index d5e74d61..7165880e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.xiaojukeji.kafka
kafka-manager
pom
- 2.1.0-SNAPSHOT
+ ${kafka-manager.revision}
org.springframework.boot
@@ -16,11 +16,10 @@
- 2.0.0-SNAPSHOT
+ 2.2.0-SNAPSHOT
2.7.0
1.5.13
-
true
true
1.8