diff --git a/build.sh b/build.sh index f99e7aaa..90671b47 100644 --- a/build.sh +++ b/build.sh @@ -3,8 +3,8 @@ workspace=$(cd $(dirname $0) && pwd -P) cd $workspace ## constant -app_name=kafka-manager -output_dir=output +km_version=2.1.0 +app_name=kafka-manager-$km_version gitversion=.gitversion control=./control.sh @@ -38,17 +38,17 @@ function build() { function make_output() { # 新建output目录 - rm -rf $output_dir &>/dev/null - mkdir -p $output_dir &>/dev/null + rm -rf $app_name &>/dev/null + mkdir -p $app_name &>/dev/null # 填充output目录, output内的内容 即为 线上部署内容 ( # cp -rf $control $output_dir && # 拷贝 control.sh 脚本 至output目录 - cp -rf $create_mysql_table $output_dir && # 拷贝 sql 初始化脚本 至output目录 - cp -rf $app_config_file $output_dir && # 拷贝 application.yml 至output目录 + cp -rf $create_mysql_table $app_name && # 拷贝 sql 初始化脚本 至output目录 + cp -rf $app_config_file $app_name && # 拷贝 application.yml 至output目录 # 拷贝程序包到output路径 - cp kafka-manager-web/target/${app_name}-*-SNAPSHOT.jar ${output_dir}/${app_name}.jar + cp kafka-manager-web/target/kafka-manager-web-$km_version-SNAPSHOT.jar ${app_name}/${app_name}-SNAPSHOT.jar echo -e "make output ok." ) || { echo -e "make output error"; exit 2; } # 填充output目录失败后, 退出码为 非0 } @@ -56,7 +56,7 @@ function make_output() { function make_package() { # 压缩output目录 ( - tar cvzf ${app_name}.tar.gz ${output_dir} + tar cvzf ${app_name}.tar.gz ${app_name} echo -e "make package ok." ) || { echo -e "make package error"; exit 2; } # 压缩output目录失败后, 退出码为 非0 } diff --git a/docs/install_guide/install_guide_cn.md b/docs/install_guide/install_guide_cn.md index dbfa5e2c..9c700587 100644 --- a/docs/install_guide/install_guide_cn.md +++ b/docs/install_guide/install_guide_cn.md @@ -49,7 +49,7 @@ mvn install cp kafka-manager-web/src/main/resources/application.yml kafka-manager-web/target/ cd kafka-manager-web/target/ -nohup java -jar kafka-manager-web-2.0.0-SNAPSHOT.jar --spring.config.location=./application.yml > /dev/null 2>&1 & +nohup java -jar kafka-manager-web-2.1.0-SNAPSHOT.jar --spring.config.location=./application.yml > /dev/null 2>&1 & ``` ## 使用 diff --git a/kafka-manager-common/pom.xml b/kafka-manager-common/pom.xml index daf647a7..f310a81a 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-console/pom.xml b/kafka-manager-console/pom.xml index e8f6295b..2339dabd 100644 --- a/kafka-manager-console/pom.xml +++ b/kafka-manager-console/pom.xml @@ -8,7 +8,7 @@ kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-core/pom.xml b/kafka-manager-core/pom.xml index 966f7c93..2360dffd 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-dao/pom.xml b/kafka-manager-dao/pom.xml index 9db31a3e..41122856 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-extends/kafka-manager-account/pom.xml b/kafka-manager-extends/kafka-manager-account/pom.xml index e112b5bf..3d129969 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-bpm/pom.xml b/kafka-manager-extends/kafka-manager-bpm/pom.xml index 3cf1c501..6a670849 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-kcm/pom.xml b/kafka-manager-extends/kafka-manager-kcm/pom.xml index ea581c86..4e087dd1 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-monitor/pom.xml b/kafka-manager-extends/kafka-manager-monitor/pom.xml index cba5366a..9d198a49 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-notify/pom.xml b/kafka-manager-extends/kafka-manager-notify/pom.xml index f0a80446..c15dba32 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-extends/kafka-manager-openapi/pom.xml b/kafka-manager-extends/kafka-manager-openapi/pom.xml index ca37d012..a0c4c277 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT ../../pom.xml diff --git a/kafka-manager-task/pom.xml b/kafka-manager-task/pom.xml index 4741a948..86c06a99 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/kafka-manager-web/pom.xml b/kafka-manager-web/pom.xml index 9970a0bf..e894af5d 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.0.0-SNAPSHOT + 2.1.0-SNAPSHOT jar kafka-manager com.xiaojukeji.kafka - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index e7d9bed0..d5e74d61 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.xiaojukeji.kafka kafka-manager pom - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT org.springframework.boot