diff --git a/bin/build-all.sh b/bin/build-all.sh index 8fa0c60..6eeae78 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -2,21 +2,15 @@ root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh mvn deploy -N -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-common,service-dependencies,service-configuration,service-forest,service-cli,service-cli/service-cli-core,service-executor,service-executor/service-executor-core,utils/executor clean source:jar deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-api,service-check,service-cli/service-cli-runner,service-cloud-query,service-command,service-exporter,service-flink-query,service-gateway,service-info-query,service-loki-query,service-pulsar-query,service-queue,service-scheduler,service-web,service-yarn-query,service-zookeeper-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml -P b2b12 -mvn -pl service-executor/service-executor-manager,service-executor/service-executor-task,service-hudi-query,utils/sync clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 +deploy service-common service-dependencies service-configuration service-forest service-cli service-cli/service-cli-core service-executor service-executor/service-executor-core utils/executor +package service-api service-check service-cli/service-cli-runner service-cloud-query service-executor/service-executor-manager service-executor/service-executor-task service-command service-exporter service-flink-query service-gateway service-hudi-query service-info-query service-monitor service-loki-query service-pulsar-query service-queue service-scheduler service-uploader service-web service-yarn-query service-zookeeper-query -mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2a4 -upload $root_path/service-launcher/target/service-launcher-b2a4-1.0.0-SNAPSHOT.jar - -mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b1 -upload $root_path/service-launcher/target/service-launcher-b2b1-1.0.0-SNAPSHOT.jar - -mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b5 -upload $root_path/service-launcher/target/service-launcher-b2b5-1.0.0-SNAPSHOT.jar - -mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 -upload $root_path/service-launcher/target/service-launcher-b2b12-1.0.0-SNAPSHOT.jar +configs=(b2a4 b2b1 b2b5 b2b12) +for config in ${configs[*]}; +do + mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P $config + upload $root_path/service-launcher/target/service-launcher-$config-1.0.0-SNAPSHOT.jar +done upload $root_path/service-api/target/service-api-1.0.0-SNAPSHOT.jar upload $root_path/service-check/target/service-check-1.0.0-SNAPSHOT.jar @@ -24,11 +18,13 @@ upload $root_path/service-cloud-query/target/service-cloud-query-1.0.0-SNAPSHOT. upload $root_path/service-command/target/service-command-1.0.0-SNAPSHOT.jar upload $root_path/service-executor/service-executor-manager/target/service-executor-manager-1.0.0-SNAPSHOT.jar upload $root_path/service-executor/service-executor-task/target/service-executor-task-1.0.0-SNAPSHOT.jar +upload $root_path/service-exporter/target/service-exporter-1.0.0-SNAPSHOT.jar upload $root_path/service-flink-query/target/service-flink-query-1.0.0-SNAPSHOT.jar upload $root_path/service-gateway/target/service-gateway-1.0.0-SNAPSHOT.jar upload $root_path/service-hudi-query/target/service-hudi-query-1.0.0-SNAPSHOT.jar upload $root_path/service-info-query/target/service-info-query-1.0.0-SNAPSHOT.jar upload $root_path/service-loki-query/target/service-loki-query-1.0.0-SNAPSHOT.jar +upload $root_path/service-monitor/target/service-monitor-1.0.0-SNAPSHOT.jar upload $root_path/service-pulsar-query/target/service-pulsar-query-1.0.0-SNAPSHOT.jar upload $root_path/service-queue/target/service-queue-1.0.0-SNAPSHOT.jar upload $root_path/service-scheduler/target/service-scheduler-1.0.0-SNAPSHOT.jar @@ -37,5 +33,5 @@ upload $root_path/service-yarn-query/target/service-yarn-query-1.0.0-SNAPSHOT.ja upload $root_path/service-zookeeper-query/target/service-zookeeper-query-1.0.0-SNAPSHOT.jar upload $root_path/utils/sync/target/sync-1.0.0-SNAPSHOT.jar -$root_path/bin/upload-rm.sh $root_path/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar -$root_path/bin/upload-rm.sh $root_path/service-uploader/target/service-uploader-1.0.0-SNAPSHOT.jar +upload_ytp $root_path/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar +upload_ytp $root_path/service-uploader/target/service-uploader-1.0.0-SNAPSHOT.jar diff --git a/bin/build-api.sh b/bin/build-api.sh index 2bec130..2cc5f71 100755 --- a/bin/build-api.sh +++ b/bin/build-api.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-api clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-api upload $root_path/service-api/target/service-api-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-check.sh b/bin/build-check.sh index d83fb82..2f00a1c 100755 --- a/bin/build-check.sh +++ b/bin/build-check.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-check clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml -P b2b12 +deploy service-common service-dependencies service-configuration service-forest +package service-check upload $root_path/service-check/target/service-check-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-cli.sh b/bin/build-cli.sh index 4e5e70a..06846c8 100755 --- a/bin/build-cli.sh +++ b/bin/build-cli.sh @@ -1,4 +1,6 @@ #!/bin/bash -mvn -pl service-cli,service-cli/service-cli-core clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-cli/service-cli-runner clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar \ No newline at end of file +root_path=$(dirname $(cd $(dirname $0);pwd)) +source $root_path/bin/library.sh +deploy service-cli service-cli/service-cli-core +package service-cli/service-cli-runner +ytp-transfer2 $root_path/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-cloud-query.sh b/bin/build-cloud-query.sh index 394e219..f8013b0 100755 --- a/bin/build-cloud-query.sh +++ b/bin/build-cloud-query.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-cloud-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-cloud-query upload $root_path/service-cloud-query/target/service-cloud-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-command.sh b/bin/build-command.sh index 09b1151..7818fa7 100755 --- a/bin/build-command.sh +++ b/bin/build-command.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-command clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-command upload $root_path/service-command/target/service-command-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-executor-manager.sh b/bin/build-executor-manager.sh index 77c0981..eb10c35 100755 --- a/bin/build-executor-manager.sh +++ b/bin/build-executor-manager.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration,service-forest,service-executor,service-executor/service-executor-core clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-executor/service-executor-manager clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 +deploy service-common service-dependencies service-configuration service-forest service-executor service-executor/service-executor-core +package service-executor/service-executor-manager upload $root_path/service-executor/service-executor-manager/target/service-executor-manager-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-executor-task.sh b/bin/build-executor-task.sh index 98954eb..4b2f4be 100755 --- a/bin/build-executor-task.sh +++ b/bin/build-executor-task.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration,service-forest,service-executor,service-executor/service-executor-core clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-executor/service-executor-task clean package -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest service-executor service-executor/service-executor-core +package service-executor/service-executor-task upload $root_path/service-executor/service-executor-task/target/service-executor-task-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-exporter.sh b/bin/build-exporter.sh index 6b07ae4..cf9b84a 100755 --- a/bin/build-exporter.sh +++ b/bin/build-exporter.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-exporter clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-exporter upload $root_path/service-exporter/target/service-exporter-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-flink-query.sh b/bin/build-flink-query.sh index 18fe9f2..ccf1ebf 100755 --- a/bin/build-flink-query.sh +++ b/bin/build-flink-query.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-flink-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-flink-query upload $root_path/service-flink-query/target/service-flink-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-gateway.sh b/bin/build-gateway.sh index 63a3ca0..ea13709 100755 --- a/bin/build-gateway.sh +++ b/bin/build-gateway.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-gateway clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-gateway upload $root_path/service-gateway/target/service-gateway-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-hudi-query.sh b/bin/build-hudi-query.sh index 595e90e..ff2249f 100755 --- a/bin/build-hudi-query.sh +++ b/bin/build-hudi-query.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-hudi-query clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 +deploy service-common service-dependencies service-configuration service-forest +package service-hudi-query upload $root_path/service-hudi-query/target/service-hudi-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-info-query.sh b/bin/build-info-query.sh index 5cc5ad8..f53fcb4 100755 --- a/bin/build-info-query.sh +++ b/bin/build-info-query.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-info-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-info-query upload $root_path/service-info-query/target/service-info-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh index 77c95ff..9fa76d1 100755 --- a/bin/build-launcher.sh +++ b/bin/build-launcher.sh @@ -1,20 +1,11 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest -echo 'Build b2a4' -mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2a4 -upload $root_path/service-launcher/target/service-launcher-b2a4-1.0.0-SNAPSHOT.jar - -echo 'Build b2b1' -mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b1 -upload $root_path/service-launcher/target/service-launcher-b2b1-1.0.0-SNAPSHOT.jar - -echo 'Build b2b5' -mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b5 -upload $root_path/service-launcher/target/service-launcher-b2b5-1.0.0-SNAPSHOT.jar - -echo 'Build b2b12' -mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 -upload $root_path/service-launcher/target/service-launcher-b2b12-1.0.0-SNAPSHOT.jar +configs=(b2a4 b2b1 b2b5 b2b12) +for config in ${configs[*]}; +do + mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P $config + upload $root_path/service-launcher/target/service-launcher-$config-1.0.0-SNAPSHOT.jar +done diff --git a/bin/build-loki-query.sh b/bin/build-loki-query.sh index d6d3704..58056b0 100755 --- a/bin/build-loki-query.sh +++ b/bin/build-loki-query.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-loki-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-loki-query upload $root_path/service-loki-query/target/service-loki-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-monitor.sh b/bin/build-monitor.sh index 2639de6..c8f80f3 100755 --- a/bin/build-monitor.sh +++ b/bin/build-monitor.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-monitor clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-monitor upload $root_path/service-monitor/target/service-monitor-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-pulsar-query.sh b/bin/build-pulsar-query.sh index 45b1f18..8a53177 100755 --- a/bin/build-pulsar-query.sh +++ b/bin/build-pulsar-query.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-pulsar-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-pulsar-query upload $root_path/service-pulsar-query/target/service-pulsar-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-queue.sh b/bin/build-queue.sh index c423a9f..589c04e 100755 --- a/bin/build-queue.sh +++ b/bin/build-queue.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-queue clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-queue upload $root_path/service-queue/target/service-queue-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-scheduler.sh b/bin/build-scheduler.sh index 2cb71e4..5554466 100755 --- a/bin/build-scheduler.sh +++ b/bin/build-scheduler.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-scheduler clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-scheduler upload $root_path/service-scheduler/target/service-scheduler-1.0.0-SNAPSHOT.jar diff --git a/bin/build-sync.sh b/bin/build-sync.sh index f4ef429..a70f873 100755 --- a/bin/build-sync.sh +++ b/bin/build-sync.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl utils/sync clean package -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package utils/sync upload $root_path/utils/sync/target/sync-1.0.0-SNAPSHOT.jar diff --git a/bin/build-uploader.sh b/bin/build-uploader.sh index 442f57e..d18516e 100755 --- a/bin/build-uploader.sh +++ b/bin/build-uploader.sh @@ -1,4 +1,6 @@ #!/bin/bash -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-uploader clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-uploader/target/service-uploader-1.0.0-SNAPSHOT.jar \ No newline at end of file +root_path=$(dirname $(cd $(dirname $0);pwd)) +source $root_path/bin/library.sh +deploy service-common service-dependencies service-configuration service-forest +package service-uploader +ytp-transfer2 $root_path/service-uploader/target/service-uploader-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-web.sh b/bin/build-web.sh index e4c9f58..88e59e8 100755 --- a/bin/build-web.sh +++ b/bin/build-web.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-web clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-web upload $root_path/service-web/target/service-web-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-yarn-query.sh b/bin/build-yarn-query.sh index 97069fb..d8249c9 100755 --- a/bin/build-yarn-query.sh +++ b/bin/build-yarn-query.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-yarn-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-yarn-query upload $root_path/service-yarn-query/target/service-yarn-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-zookeeper-query.sh b/bin/build-zookeeper-query.sh index be7d6b9..d8d4cbf 100755 --- a/bin/build-zookeeper-query.sh +++ b/bin/build-zookeeper-query.sh @@ -1,6 +1,6 @@ #!/bin/bash root_path=$(dirname $(cd $(dirname $0);pwd)) source $root_path/bin/library.sh -mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-zookeeper-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml +deploy service-common service-dependencies service-configuration service-forest +package service-zookeeper-query upload $root_path/service-zookeeper-query/target/service-zookeeper-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/check b/bin/check old mode 100644 new mode 100755 diff --git a/bin/generate b/bin/generate old mode 100644 new mode 100755 index a844e16..a2cda43 --- a/bin/generate +++ b/bin/generate @@ -5,7 +5,12 @@ jdk_path=/opt/jdk1.8.0_162/bin/java arguments=$@ curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/service-cli-runner-1.0.0-SNAPSHOT.jar -o ${jars_path}/service-cli-runner.jar -${jdk_path} -jar ${jars_path}/service-cli-runner.jar --spring.profiles.active=b12 --deploy.generate.command=true --deploy.generate.uploader=true --deploy.generate.update-jar=true $arguments +${jdk_path} -jar ${jars_path}/service-cli-runner.jar \ + --spring.profiles.active=b12 \ + --deploy.generate.command=true \ + --deploy.generate.uploader=true \ + --deploy.generate.update-jar=true \ + $arguments chmod +x cloud/*.sh chmod +x command/cli* diff --git a/bin/library.sh b/bin/library.sh index 40ea344..d584280 100755 --- a/bin/library.sh +++ b/bin/library.sh @@ -1,9 +1,18 @@ #!/bin/bash -encrypt_username=AxhEbscwsJDbYMH2 -encrypt_password=cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4 +build_profile=b2b12 -upload_url=http://$encrypt_username:$encrypt_password@132.126.207.124:36800 +iap_username=iap +iap_password=IAPAb123456! +iap_url=$iap_username@132.122.1.162 + +ytp_username=yyy +ytp_password='QeY\!68\)4nH1' +ytp_url=ftp://$ytp_username:$ytp_password@132.121.122.15:2222 + +upload_username=AxhEbscwsJDbYMH2 +upload_password=cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4 +upload_url=http://$upload_username:$upload_password@132.126.207.124:36800 root_path=$(dirname $(cd $(dirname $0);pwd)) @@ -18,3 +27,33 @@ function upload() { echo "↪ Delete source" rm $source_file_path } + +function upload_ytp() { + source_file_path=$(realpath $1) + file_name=$(basename $source_file_path) + echo "↪ Source md5: $(md5sum $source_file_path | awk '{print $1}')" + echo "↪ Uploading $source_file_path ↪ /tmp/$file_name" + sshpass -p $iap_password scp $source_file_path $iap_url:/tmp + echo "↪ Upload 162 success" + target_md5=$(sshpass -p $iap_password ssh -o 'StrictHostKeyChecking no' $iap_url "md5sum /tmp/$file_name | awk '{print \$1}'") + echo "↪ Target md5: $target_md5" + echo "↪ Command: sshpass -p $iap_password ssh -o 'StrictHostKeyChecking no' $iap_url \"curl --retry 5 $ytp_url -T /tmp/$file_name\"" + sshpass -p $iap_password ssh -o 'StrictHostKeyChecking no' $iap_url "curl --retry 5 $ytp_url -T /tmp/$file_name" + echo "↪ Upload ytp success" + echo "↪ Download: curl $ytp_url/$file_name -o $file_name" +} + +function joining { + local d=${1-} f=${2-} + if shift 2; then + printf %s "$f" "${@/#/$d}" + fi +} + +function deploy() { + mvn -pl $(joining , $@) clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +} + +function package() { + mvn -pl $(joining , $@) clean package -D skipTests -P local -s ~/.m2/settings-development.xml -P $build_profile +} diff --git a/bin/upload-all.sh b/bin/upload-all.sh deleted file mode 100755 index 9eb24f8..0000000 --- a/bin/upload-all.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-flink-query/target/service-flink-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-hudi-query/target/service-hudi-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-info-query/target/service-info-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-loki-query/target/service-loki-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-pulsar-query/target/service-pulsar-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-yarn-query/target/service-yarn-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-zookeeper-query/target/service-zookeeper-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-web/target/service-web-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-executor/service-executor-manager/target/service-executor-manager-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-executor/service-executor-task/target/service-executor-task-1.0.0-SNAPSHOT.jar diff --git a/bin/upload-config.sh b/bin/upload-config.sh deleted file mode 100755 index 26041a9..0000000 --- a/bin/upload-config.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -root_path=$(dirname $(cd $(dirname $0); pwd)) - -clusters=( - b2a4 - b2b1 - b2b5 - b2b12 -) - -for cluster in ${clusters[*]}; -do - cd ${root_path}/config/${cluster} - echo Upload config ${cluster} - tar_path=/tmp/${cluster}.tar.gz - tar -czvf ${tar_path} * - ytp-transfer ${tar_path} - rm -rf ${tar_path} -done diff --git a/bin/upload-rm.sh b/bin/upload-rm.sh deleted file mode 100755 index f11f3a5..0000000 --- a/bin/upload-rm.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -file_path=$1 -ytp-transfer2 $file_path -rm -rf $file_path \ No newline at end of file diff --git a/service-api/pom.xml b/service-api/pom.xml index 058823f..f07f370 100644 --- a/service-api/pom.xml +++ b/service-api/pom.xml @@ -32,13 +32,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-check/pom.xml b/service-check/pom.xml index 76450d1..2baae15 100644 --- a/service-check/pom.xml +++ b/service-check/pom.xml @@ -103,10 +103,6 @@ - - org.apache.maven.plugins - maven-source-plugin - org.apache.maven.plugins maven-shade-plugin diff --git a/service-cli/service-cli-core/pom.xml b/service-cli/service-cli-core/pom.xml index 99464f2..ffaf80b 100644 --- a/service-cli/service-cli-core/pom.xml +++ b/service-cli/service-cli-core/pom.xml @@ -23,6 +23,14 @@ org.apache.maven.plugins maven-source-plugin + + + package + + jar + + + diff --git a/service-cli/service-cli-runner/pom.xml b/service-cli/service-cli-runner/pom.xml index 231071b..eca4ccb 100644 --- a/service-cli/service-cli-runner/pom.xml +++ b/service-cli/service-cli-runner/pom.xml @@ -46,13 +46,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-cloud-query/pom.xml b/service-cloud-query/pom.xml index e06bd7c..8fb8eec 100644 --- a/service-cloud-query/pom.xml +++ b/service-cloud-query/pom.xml @@ -24,13 +24,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-command/pom.xml b/service-command/pom.xml index 8375551..5018f05 100644 --- a/service-command/pom.xml +++ b/service-command/pom.xml @@ -38,13 +38,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-common/pom.xml b/service-common/pom.xml index 37fdbe0..032b1e8 100644 --- a/service-common/pom.xml +++ b/service-common/pom.xml @@ -30,6 +30,14 @@ org.apache.maven.plugins maven-source-plugin + + + package + + jar + + + diff --git a/service-configuration/pom.xml b/service-configuration/pom.xml index 723968b..cec39b1 100644 --- a/service-configuration/pom.xml +++ b/service-configuration/pom.xml @@ -23,6 +23,14 @@ org.apache.maven.plugins maven-source-plugin + + + package + + jar + + + diff --git a/service-executor/service-executor-core/pom.xml b/service-executor/service-executor-core/pom.xml index 66550a0..2ac4534 100644 --- a/service-executor/service-executor-core/pom.xml +++ b/service-executor/service-executor-core/pom.xml @@ -16,6 +16,14 @@ org.apache.maven.plugins maven-source-plugin + + + package + + jar + + + diff --git a/service-executor/service-executor-manager/pom.xml b/service-executor/service-executor-manager/pom.xml index 6508946..96579c9 100644 --- a/service-executor/service-executor-manager/pom.xml +++ b/service-executor/service-executor-manager/pom.xml @@ -122,10 +122,6 @@ - - org.apache.maven.plugins - maven-source-plugin - org.apache.maven.plugins maven-shade-plugin diff --git a/service-executor/service-executor-task/pom.xml b/service-executor/service-executor-task/pom.xml index a795118..434b42f 100644 --- a/service-executor/service-executor-task/pom.xml +++ b/service-executor/service-executor-task/pom.xml @@ -81,10 +81,6 @@ - - org.apache.maven.plugins - maven-source-plugin - org.apache.maven.plugins maven-shade-plugin diff --git a/service-exporter/pom.xml b/service-exporter/pom.xml index f9df1dd..277a5fb 100644 --- a/service-exporter/pom.xml +++ b/service-exporter/pom.xml @@ -29,13 +29,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-flink-query/pom.xml b/service-flink-query/pom.xml index ea0ae2c..d544cf6 100644 --- a/service-flink-query/pom.xml +++ b/service-flink-query/pom.xml @@ -24,13 +24,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-forest/pom.xml b/service-forest/pom.xml index 08c3bf4..ad9d504 100644 --- a/service-forest/pom.xml +++ b/service-forest/pom.xml @@ -35,6 +35,14 @@ org.apache.maven.plugins maven-source-plugin + + + package + + jar + + + diff --git a/service-gateway/pom.xml b/service-gateway/pom.xml index 5b1ef1a..077d290 100644 --- a/service-gateway/pom.xml +++ b/service-gateway/pom.xml @@ -34,13 +34,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-hudi-query/pom.xml b/service-hudi-query/pom.xml index e82f11d..844a5f5 100644 --- a/service-hudi-query/pom.xml +++ b/service-hudi-query/pom.xml @@ -115,10 +115,6 @@ - - org.apache.maven.plugins - maven-source-plugin - org.apache.maven.plugins maven-shade-plugin diff --git a/service-info-query/pom.xml b/service-info-query/pom.xml index ea1a815..7308678 100644 --- a/service-info-query/pom.xml +++ b/service-info-query/pom.xml @@ -44,13 +44,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-loki-query/pom.xml b/service-loki-query/pom.xml index 177f2f9..486aaae 100644 --- a/service-loki-query/pom.xml +++ b/service-loki-query/pom.xml @@ -24,13 +24,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 85ca2e5..a9d0b9c 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -28,13 +28,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-pulsar-query/pom.xml b/service-pulsar-query/pom.xml index 32bb428..a5cbbb9 100644 --- a/service-pulsar-query/pom.xml +++ b/service-pulsar-query/pom.xml @@ -44,13 +44,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-queue/pom.xml b/service-queue/pom.xml index 30b927d..0dca659 100644 --- a/service-queue/pom.xml +++ b/service-queue/pom.xml @@ -24,13 +24,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-scheduler/pom.xml b/service-scheduler/pom.xml index c94d3b4..03d9243 100644 --- a/service-scheduler/pom.xml +++ b/service-scheduler/pom.xml @@ -31,6 +31,14 @@ org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-web/pom.xml b/service-web/pom.xml index 504e37e..187cb00 100644 --- a/service-web/pom.xml +++ b/service-web/pom.xml @@ -31,6 +31,14 @@ org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-yarn-query/pom.xml b/service-yarn-query/pom.xml index f95faa8..0dddfbd 100644 --- a/service-yarn-query/pom.xml +++ b/service-yarn-query/pom.xml @@ -24,13 +24,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + + diff --git a/service-zookeeper-query/pom.xml b/service-zookeeper-query/pom.xml index effb0e5..e510081 100644 --- a/service-zookeeper-query/pom.xml +++ b/service-zookeeper-query/pom.xml @@ -24,13 +24,17 @@ - - org.apache.maven.plugins - maven-source-plugin - org.springframework.boot spring-boot-maven-plugin + + + package + + repackage + + +