From ceed44d43adc96d3dae78c6b6ccf09272ffeb250 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Wed, 17 May 2023 13:00:48 +0800 Subject: [PATCH] =?UTF-8?q?feature(dependencies):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加一个依赖模块，统一项目使用的主要 jar 依赖版本，但又不写在父项目里，防止加入一些非服务模块，比如启动命令行 --- bin/build-flink-query.sh | 2 +- bin/build-hudi-query.sh | 2 +- bin/build-info-query.sh | 2 +- bin/build-pulsar-query.sh | 2 +- bin/build-web.sh | 2 +- bin/build-yarn-query.sh | 2 +- bin/build-zookeeper-query.sh | 2 +- pom.xml | 91 +--------------------------- service-configuration/pom.xml | 8 +++ service-dependencies/pom.xml | 104 ++++++++++++++++++++++++++++++++ service-flink-query/pom.xml | 5 ++ service-forest/pom.xml | 5 ++ service-hudi-query/pom.xml | 5 ++ service-info-query/pom.xml | 5 ++ service-pulsar-query/pom.xml | 5 ++ service-web/pom.xml | 5 ++ service-yarn-query/pom.xml | 5 ++ service-zookeeper-query/pom.xml | 5 ++ 18 files changed, 160 insertions(+), 97 deletions(-) create mode 100644 service-dependencies/pom.xml diff --git a/bin/build-flink-query.sh b/bin/build-flink-query.sh index 92d6a70..220a8d5 100755 --- a/bin/build-flink-query.sh +++ b/bin/build-flink-query.sh @@ -1,5 +1,5 @@ #!/bin/bash -mvn -pl service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl 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 sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) scp /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-flink-query/target/service-flink-query-1.0.0-SNAPSHOT.jar iap@132.122.1.162:/apps/iap/tmp/lanyuanxiaoyao sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) ssh -o 'StrictHostKeyChecking no' iap@132.122.1.162 'curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222 -T /apps/iap/tmp/lanyuanxiaoyao/service-flink-query-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 daf1042..a4d8bb5 100755 --- a/bin/build-hudi-query.sh +++ b/bin/build-hudi-query.sh @@ -1,5 +1,5 @@ #!/bin/bash -mvn -pl service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl 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 b2s119 sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) scp /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-hudi-query/target/service-hudi-query-1.0.0-SNAPSHOT.jar iap@132.122.1.162:/apps/iap/tmp/lanyuanxiaoyao sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) ssh -o 'StrictHostKeyChecking no' iap@132.122.1.162 'curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222 -T /apps/iap/tmp/lanyuanxiaoyao/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 c207b33..5909d26 100755 --- a/bin/build-info-query.sh +++ b/bin/build-info-query.sh @@ -1,5 +1,5 @@ #!/bin/bash -mvn -pl service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl 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 sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) scp /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-info-query/target/service-info-query-1.0.0-SNAPSHOT.jar iap@132.122.1.162:/apps/iap/tmp/lanyuanxiaoyao sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) ssh -o 'StrictHostKeyChecking no' iap@132.122.1.162 'curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222 -T /apps/iap/tmp/lanyuanxiaoyao/service-info-query-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 d283681..8de067c 100755 --- a/bin/build-pulsar-query.sh +++ b/bin/build-pulsar-query.sh @@ -1,5 +1,5 @@ #!/bin/bash -mvn -pl service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl 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 sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) scp /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-pulsar-query/target/service-pulsar-query-1.0.0-SNAPSHOT.jar iap@132.122.1.162:/apps/iap/tmp/lanyuanxiaoyao sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) ssh -o 'StrictHostKeyChecking no' iap@132.122.1.162 'curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222 -T /apps/iap/tmp/lanyuanxiaoyao/service-pulsar-query-1.0.0-SNAPSHOT.jar' \ No newline at end of file diff --git a/bin/build-web.sh b/bin/build-web.sh index b66e99c..3ff6bc4 100755 --- a/bin/build-web.sh +++ b/bin/build-web.sh @@ -1,5 +1,5 @@ #!/bin/bash -mvn -pl service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl 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 sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) scp /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-web/target/service-web-1.0.0-SNAPSHOT.jar iap@132.122.1.162:/apps/iap/tmp/lanyuanxiaoyao sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) ssh -o 'StrictHostKeyChecking no' iap@132.122.1.162 'curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222 -T /apps/iap/tmp/lanyuanxiaoyao/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 9bdc6dd..657b5da 100755 --- a/bin/build-yarn-query.sh +++ b/bin/build-yarn-query.sh @@ -1,5 +1,5 @@ #!/bin/bash -mvn -pl service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl 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 sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) scp /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-yarn-query/target/service-yarn-query-1.0.0-SNAPSHOT.jar iap@132.122.1.162:/apps/iap/tmp/lanyuanxiaoyao sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) ssh -o 'StrictHostKeyChecking no' iap@132.122.1.162 'curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222 -T /apps/iap/tmp/lanyuanxiaoyao/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 2c8b7b6..0c470f0 100755 --- a/bin/build-zookeeper-query.sh +++ b/bin/build-zookeeper-query.sh @@ -1,5 +1,5 @@ #!/bin/bash -mvn -pl service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl 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 sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) scp /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-zookeeper-query/target/service-zookeeper-query-1.0.0-SNAPSHOT.jar iap@132.122.1.162:/apps/iap/tmp/lanyuanxiaoyao sshpass -p $(/Users/lanyuanxiaoyao/Project/Work/Host/keepassxc-password.sh SSH/iap/132.122.1.162) ssh -o 'StrictHostKeyChecking no' iap@132.122.1.162 'curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222 -T /apps/iap/tmp/lanyuanxiaoyao/service-zookeeper-query-1.0.0-SNAPSHOT.jar' \ No newline at end of file diff --git a/pom.xml b/pom.xml index 63fa28e..82d4360 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ service-web service-forest service-zookeeper-query + service-dependencies @@ -64,96 +65,6 @@ - - - com.eshore.odcp.hudi.connector - common - 1.0.0-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-actuator - - - io.micrometer - micrometer-registry-prometheus - - - org.springframework.cloud - spring-cloud-starter-sleuth - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.retry - spring-retry - - - com.github.ben-manes.caffeine - caffeine - - - pl.tkowalcz.tjahzi - logback-appender - 0.9.23 - - - com.github.loki4j - loki-logback-appender-jdk8 - 1.3.2 - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - dev.failsafe - failsafe - 3.2.4 - - - org.eclipse.collections - eclipse-collections - 10.4.0 - runtime - - - org.eclipse.collections - eclipse-collections-api - 10.4.0 - - - com.fasterxml.jackson.datatype - jackson-datatype-eclipse-collections - 2.13.5 - - - cn.hutool - hutool-all - 5.7.16 - - - diff --git a/service-configuration/pom.xml b/service-configuration/pom.xml index 0d6fcf5..6402678 100644 --- a/service-configuration/pom.xml +++ b/service-configuration/pom.xml @@ -11,4 +11,12 @@ service-configuration + + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + + + \ No newline at end of file diff --git a/service-dependencies/pom.xml b/service-dependencies/pom.xml new file mode 100644 index 0000000..26ce65b --- /dev/null +++ b/service-dependencies/pom.xml @@ -0,0 +1,104 @@ + + + 4.0.0 + + com.lanyuanxiaoyao + hudi-service + 1.0.0-SNAPSHOT + + + service-dependencies + + + + com.eshore.odcp.hudi.connector + common + 1.0.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-cache + + + org.springframework.boot + spring-boot-starter-actuator + + + io.micrometer + micrometer-registry-prometheus + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework.retry + spring-retry + + + com.github.ben-manes.caffeine + caffeine + + + pl.tkowalcz.tjahzi + logback-appender + 0.9.23 + + + com.github.loki4j + loki-logback-appender-jdk8 + 1.3.2 + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + dev.failsafe + failsafe + 3.2.4 + + + org.eclipse.collections + eclipse-collections + 10.4.0 + runtime + + + org.eclipse.collections + eclipse-collections-api + 10.4.0 + + + com.fasterxml.jackson.datatype + jackson-datatype-eclipse-collections + 2.13.5 + + + cn.hutool + hutool-all + 5.7.16 + + + + \ No newline at end of file diff --git a/service-flink-query/pom.xml b/service-flink-query/pom.xml index 08462cb..bb3e8de 100644 --- a/service-flink-query/pom.xml +++ b/service-flink-query/pom.xml @@ -12,6 +12,11 @@ service-flink-query + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + com.lanyuanxiaoyao service-configuration diff --git a/service-forest/pom.xml b/service-forest/pom.xml index 38e8d69..476a78c 100644 --- a/service-forest/pom.xml +++ b/service-forest/pom.xml @@ -12,6 +12,11 @@ service-forest + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + com.lanyuanxiaoyao service-configuration diff --git a/service-hudi-query/pom.xml b/service-hudi-query/pom.xml index bee2508..6d899be 100644 --- a/service-hudi-query/pom.xml +++ b/service-hudi-query/pom.xml @@ -12,6 +12,11 @@ service-hudi-query + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + com.lanyuanxiaoyao service-configuration diff --git a/service-info-query/pom.xml b/service-info-query/pom.xml index ca89351..9e8ddbd 100644 --- a/service-info-query/pom.xml +++ b/service-info-query/pom.xml @@ -12,6 +12,11 @@ service-info-query + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + com.lanyuanxiaoyao service-configuration diff --git a/service-pulsar-query/pom.xml b/service-pulsar-query/pom.xml index 3bc3b84..62b2e5b 100644 --- a/service-pulsar-query/pom.xml +++ b/service-pulsar-query/pom.xml @@ -12,6 +12,11 @@ service-pulsar-query + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + com.lanyuanxiaoyao service-configuration diff --git a/service-web/pom.xml b/service-web/pom.xml index 5c134f0..1f054f4 100644 --- a/service-web/pom.xml +++ b/service-web/pom.xml @@ -12,6 +12,11 @@ service-web + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + com.lanyuanxiaoyao service-configuration diff --git a/service-yarn-query/pom.xml b/service-yarn-query/pom.xml index 0819ea5..ed88012 100644 --- a/service-yarn-query/pom.xml +++ b/service-yarn-query/pom.xml @@ -12,6 +12,11 @@ service-yarn-query + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + com.lanyuanxiaoyao service-configuration diff --git a/service-zookeeper-query/pom.xml b/service-zookeeper-query/pom.xml index 992efdb..8e064b6 100644 --- a/service-zookeeper-query/pom.xml +++ b/service-zookeeper-query/pom.xml @@ -12,6 +12,11 @@ service-zookeeper-query + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + com.lanyuanxiaoyao service-configuration