From d3f964fcdcc74bbc954603197cb0d8539990008f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E7=A7=B0?= Date: Fri, 12 May 2023 18:57:37 +0800 Subject: [PATCH] Abstract hippo4j-dependencies for module refactoring (#1245) (#1253) --- .../hippo4j-adapter-alibaba-dubbo/pom.xml | 1 - hippo4j-adapter/hippo4j-adapter-base/pom.xml | 2 +- hippo4j-adapter/hippo4j-adapter-dubbo/pom.xml | 1 - .../hippo4j-adapter-hystrix/pom.xml | 1 - .../hippo4j-adapter-rocketmq/pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - hippo4j-adapter/hippo4j-adapter-web/pom.xml | 1 - .../spring-plugin-common/pom.xml | 1 - hippo4j-common/pom.xml | 28 --- .../state/AbstractThreadPoolRuntimeTest.java | 1 + hippo4j-dependencies/pom.xml | 221 ++++++++++++++++++ .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 2 - .../pom.xml | 1 - .../pom.xml | 1 - .../hippo4j-monitor-elasticsearch/pom.xml | 4 - .../hippo4j-monitor-micrometer/pom.xml | 1 - hippo4j-rpc/pom.xml | 4 + hippo4j-server/hippo4j-auth/pom.xml | 2 - hippo4j-server/hippo4j-config/pom.xml | 2 - .../pom.xml | 12 + .../pom.xml | 11 +- .../pom.xml | 1 - pom.xml | 94 ++------ 30 files changed, 268 insertions(+), 133 deletions(-) create mode 100644 hippo4j-dependencies/pom.xml diff --git a/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml b/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml index bf041aa2..b11d480e 100644 --- a/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-alibaba-dubbo/pom.xml @@ -18,7 +18,6 @@ com.alibaba dubbo - ${alibaba-dubbo.version} true diff --git a/hippo4j-adapter/hippo4j-adapter-base/pom.xml b/hippo4j-adapter/hippo4j-adapter-base/pom.xml index 1da27fda..fa0cf9a9 100644 --- a/hippo4j-adapter/hippo4j-adapter-base/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-base/pom.xml @@ -13,7 +13,7 @@ cn.hippo4j hippo4j-common - ${revision} + ${project.version} diff --git a/hippo4j-adapter/hippo4j-adapter-dubbo/pom.xml b/hippo4j-adapter/hippo4j-adapter-dubbo/pom.xml index 4ad5ab2f..efe482c9 100644 --- a/hippo4j-adapter/hippo4j-adapter-dubbo/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-dubbo/pom.xml @@ -18,7 +18,6 @@ org.apache.dubbo dubbo - ${dubbo.version} true diff --git a/hippo4j-adapter/hippo4j-adapter-hystrix/pom.xml b/hippo4j-adapter/hippo4j-adapter-hystrix/pom.xml index 55553850..7f3687ca 100644 --- a/hippo4j-adapter/hippo4j-adapter-hystrix/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-hystrix/pom.xml @@ -18,7 +18,6 @@ org.springframework.cloud spring-cloud-starter-netflix-hystrix - ${spring-cloud-starter-netflix-hystrix.version} true diff --git a/hippo4j-adapter/hippo4j-adapter-rocketmq/pom.xml b/hippo4j-adapter/hippo4j-adapter-rocketmq/pom.xml index 70210369..cbb41cdf 100644 --- a/hippo4j-adapter/hippo4j-adapter-rocketmq/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-rocketmq/pom.xml @@ -18,7 +18,6 @@ org.apache.rocketmq rocketmq-spring-boot-starter - ${rocketmq.version} true diff --git a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/pom.xml b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/pom.xml index 3c4e1be6..39de977f 100644 --- a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/pom.xml @@ -18,7 +18,6 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - ${spring-cloud-starter-stream-rabbitmq.version} true diff --git a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rocketmq/pom.xml b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rocketmq/pom.xml index 95e96968..adfb7f41 100644 --- a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rocketmq/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rocketmq/pom.xml @@ -18,7 +18,6 @@ com.alibaba.cloud spring-cloud-starter-stream-rocketmq - ${spring-cloud-starter-stream-rocketmq.version} true diff --git a/hippo4j-adapter/hippo4j-adapter-web/pom.xml b/hippo4j-adapter/hippo4j-adapter-web/pom.xml index b6e98183..643db7e2 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/pom.xml +++ b/hippo4j-adapter/hippo4j-adapter-web/pom.xml @@ -13,7 +13,6 @@ org.apache.tomcat.embed tomcat-embed-core - ${tomcat-embed-core.version} true diff --git a/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/pom.xml b/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/pom.xml index 101d9ab9..b525f6d5 100644 --- a/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/pom.xml +++ b/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/pom.xml @@ -32,7 +32,6 @@ com.ctrip.framework.apollo apollo-client - ${apollo.version} provided diff --git a/hippo4j-common/pom.xml b/hippo4j-common/pom.xml index aeff902a..8b0a18cc 100644 --- a/hippo4j-common/pom.xml +++ b/hippo4j-common/pom.xml @@ -9,34 +9,7 @@ hippo4j-common - - 5.2.21.RELEASE - 5.2.15.RELEASE - 5.2.21.RELEASE - 5.2.23.RELEASE - - - - org.springframework - spring-context - ${spring-context.version} - - - org.springframework - spring-web - ${spring-web.version} - - - org.springframework - spring-beans - ${spring-beans.version} - - - org.springframework - spring-core - ${spring-core.version} - com.fasterxml.jackson.core jackson-databind @@ -67,7 +40,6 @@ com.github.ben-manes.caffeine caffeine - ${caffeine.version} com.github.dozermapper diff --git a/hippo4j-core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java b/hippo4j-core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java index 250dfdb4..d08fb953 100644 --- a/hippo4j-core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java +++ b/hippo4j-core/src/test/java/cn/hippo4j/core/executor/state/AbstractThreadPoolRuntimeTest.java @@ -36,6 +36,7 @@ public class AbstractThreadPoolRuntimeTest { @Test void testPoolRunState() { AbstractThreadPoolRuntime threadPoolRuntime = new AbstractThreadPoolRuntime() { + @Override public ThreadPoolRunStateInfo supplement(ThreadPoolRunStateInfo threadPoolRunStateInfo) { return threadPoolRunStateInfo; diff --git a/hippo4j-dependencies/pom.xml b/hippo4j-dependencies/pom.xml new file mode 100644 index 00000000..af91cef3 --- /dev/null +++ b/hippo4j-dependencies/pom.xml @@ -0,0 +1,221 @@ + + + 4.0.0 + cn.hippo4j + hippo4j-dependencies + ${revision} + pom + Hippo4j Dependencies + + + 2.0.0-SNAPSHOT + 6.5.0 + 2.9.3 + 6.1.5.Final + 0.9.0 + 2.11.1 + 2.1.214 + 3.12.4 + 3.0.5 + 2.6.12 + 1.7.7 + 1.8.4 + 2.0.4 + 3.4.2 + 2.3.2.RELEASE + 1.9.1 + 2.2.4.RELEASE + 0.7.3 + 1.7.2 + 2.2.2 + 4.1.56.Final + 6.8.17 + 9.0.55 + 5.1.0 + 2.2.6.RELEASE + 3.1.0 + 2.2.9.RELEASE + 2.2.5.RELEASE + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.github.dozermapper + dozer-core + ${dozer.version} + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + org.apache.dubbo + dubbo + ${dubbo.version} + true + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + + + com.alibaba + dubbo + ${alibaba-dubbo.version} + + + io.micrometer + micrometer-core + ${micrometer-core.version} + + + com.ctrip.framework.apollo + apollo-client + ${apollo.version} + + + com.github.ben-manes.caffeine + caffeine + ${caffeine.version} + + + org.hibernate.validator + hibernate-validator + ${hibernate-validator.version} + + + io.jsonwebtoken + jjwt + ${jjwt.version} + + + com.h2database + h2 + ${h2.version} + runtime + + + org.springframework.cloud + spring-cloud-starter-consul-config + ${consul.version} + + + io.etcd + jetcd-core + ${jetcd.version} + + + com.tencent.polaris + polaris-configuration-factory + ${polaris.version} + + + com.tencent.polaris + router-rule + + + com.tencent.polaris + router-nearby + + + com.tencent.polaris + router-metadata + + + com.tencent.polaris + router-canary + + + com.tencent.polaris + router-set + + + com.tencent.polaris + router-isolated + + + com.tencent.polaris + router-healthy + + + io.grpc + grpc-all + + + + + org.apache.rocketmq + rocketmq-spring-boot-starter + ${rocketmq.version} + + + io.netty + netty-all + ${netty.version} + + + org.elasticsearch + elasticsearch + ${elasticsearch.version} + + + org.elasticsearch.client + transport + ${elasticsearch.version} + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + ${elasticsearch.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat-embed-core.version} + + + org.apache.curator + curator-framework + ${curator-framework.version} + + + com.alibaba.cloud + spring-cloud-starter-stream-rocketmq + ${spring-cloud-starter-stream-rocketmq.version} + + + org.springframework.cloud + spring-cloud-starter-stream-rabbit + ${spring-cloud-starter-stream-rabbitmq.version} + + + org.springframework.cloud + spring-cloud-starter-netflix-hystrix + ${spring-cloud-starter-netflix-hystrix.version} + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + ${spring-cloud-starter-alibaba-nacos-config.version} + + + + \ No newline at end of file diff --git a/hippo4j-example/hippo4j-config-apollo-spring-boot-1x-starter-example/pom.xml b/hippo4j-example/hippo4j-config-apollo-spring-boot-1x-starter-example/pom.xml index cfdab36b..a9d0848c 100644 --- a/hippo4j-example/hippo4j-config-apollo-spring-boot-1x-starter-example/pom.xml +++ b/hippo4j-example/hippo4j-config-apollo-spring-boot-1x-starter-example/pom.xml @@ -46,7 +46,6 @@ com.ctrip.framework.apollo apollo-client - ${apollo.version} diff --git a/hippo4j-example/hippo4j-config-apollo-spring-boot-starter-example/pom.xml b/hippo4j-example/hippo4j-config-apollo-spring-boot-starter-example/pom.xml index eea56b5e..ad8216c4 100644 --- a/hippo4j-example/hippo4j-config-apollo-spring-boot-starter-example/pom.xml +++ b/hippo4j-example/hippo4j-config-apollo-spring-boot-starter-example/pom.xml @@ -45,7 +45,6 @@ com.ctrip.framework.apollo apollo-client - ${apollo.version} diff --git a/hippo4j-example/hippo4j-config-consul-spring-boot-starter-example/pom.xml b/hippo4j-example/hippo4j-config-consul-spring-boot-starter-example/pom.xml index e2e5d937..55a090b9 100644 --- a/hippo4j-example/hippo4j-config-consul-spring-boot-starter-example/pom.xml +++ b/hippo4j-example/hippo4j-config-consul-spring-boot-starter-example/pom.xml @@ -31,7 +31,6 @@ org.springframework.cloud spring-cloud-starter-consul-config - ${consul.version} io.micrometer diff --git a/hippo4j-example/hippo4j-config-etcd-spring-boot-starter-example/pom.xml b/hippo4j-example/hippo4j-config-etcd-spring-boot-starter-example/pom.xml index c31e7f3c..23760416 100644 --- a/hippo4j-example/hippo4j-config-etcd-spring-boot-starter-example/pom.xml +++ b/hippo4j-example/hippo4j-config-etcd-spring-boot-starter-example/pom.xml @@ -35,7 +35,6 @@ io.etcd jetcd-core - ${jetcd.version} diff --git a/hippo4j-example/hippo4j-spring-boot-starter-adapter-rocketmq-example/pom.xml b/hippo4j-example/hippo4j-spring-boot-starter-adapter-rocketmq-example/pom.xml index ba28fe22..27fa2570 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-adapter-rocketmq-example/pom.xml +++ b/hippo4j-example/hippo4j-spring-boot-starter-adapter-rocketmq-example/pom.xml @@ -44,7 +44,6 @@ org.apache.rocketmq rocketmq-spring-boot-starter - ${rocketmq.version} diff --git a/hippo4j-example/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rabbitmq-example/pom.xml b/hippo4j-example/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rabbitmq-example/pom.xml index 17c7ad72..7cabc0d9 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rabbitmq-example/pom.xml +++ b/hippo4j-example/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rabbitmq-example/pom.xml @@ -44,7 +44,6 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - ${spring-cloud-starter-stream-rabbitmq.version} diff --git a/hippo4j-example/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rocketmq-example/pom.xml b/hippo4j-example/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rocketmq-example/pom.xml index bab477e1..ed475658 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rocketmq-example/pom.xml +++ b/hippo4j-example/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rocketmq-example/pom.xml @@ -11,7 +11,6 @@ true - 2.2.6.RELEASE @@ -26,7 +25,6 @@ com.alibaba.cloud spring-cloud-starter-stream-rocketmq - ${spring-cloud-starter-stream-rocketmq.version} org.projectlombok diff --git a/hippo4j-example/hippo4j-spring-boot-starter-es-monitor-example/pom.xml b/hippo4j-example/hippo4j-spring-boot-starter-es-monitor-example/pom.xml index 7ce81a3c..0451dd10 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-es-monitor-example/pom.xml +++ b/hippo4j-example/hippo4j-spring-boot-starter-es-monitor-example/pom.xml @@ -34,7 +34,6 @@ org.apache.tomcat.embed tomcat-embed-core - ${tomcat-embed-core.version} diff --git a/hippo4j-example/hippo4j-spring-boot-starter-example/pom.xml b/hippo4j-example/hippo4j-spring-boot-starter-example/pom.xml index e1f1fd2e..621cd75a 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-example/pom.xml +++ b/hippo4j-example/hippo4j-spring-boot-starter-example/pom.xml @@ -50,7 +50,6 @@ org.apache.tomcat.embed tomcat-embed-core - ${tomcat-embed-core.version} - 6.5.0 - 2.9.3 - 6.1.5.Final - 0.9.0 - 2.11.1 - 2.1.214 + 2.0.0-SNAPSHOT 3.12.4 - - 3.0.5 - 2.6.12 - 1.7.7 - 1.8.4 - 2.0.4 - 3.4.2 - 2.3.2.RELEASE - 1.9.1 - 2.2.4.RELEASE - 0.7.3 - 1.7.2 - 2.2.2 - 4.1.56.Final - 6.8.17 - 9.0.55 - 5.1.0 - 2.2.6.RELEASE - 3.1.0 - 2.2.9.RELEASE - 2.2.5.RELEASE - 1.8 true false @@ -97,37 +80,18 @@ 3.0 2.22.1 3.1.0 + 2.3.2.RELEASE - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} + cn.hippo4j + hippo4j-dependencies + ${revision} pom import - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.github.dozermapper - dozer-core - ${dozer.version} - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - io.netty - netty-all - ${netty.version} - org.mockito mockito-core @@ -203,7 +167,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot.version} + ${spring-boot-maven-plugin.version} @@ -290,8 +254,11 @@ maven-checkstyle-plugin ${maven-checkstyle-plugin.version} - ${maven.multiModuleProjectDirectory}/dev-support/hippo4j_checkstyle.xml - ${maven.multiModuleProjectDirectory}/dev-support/hippo4j_checkstyle_suppression.xml + ${maven.multiModuleProjectDirectory}/dev-support/hippo4j_checkstyle.xml + + + ${maven.multiModuleProjectDirectory}/dev-support/hippo4j_checkstyle_suppression.xml + false true @@ -334,21 +301,10 @@ - - scm:git@github.com:opengoofy/hippo4j - scm:git@github.com:opengoofy/hippo4j.git - git@github.com:opengoofy/hippo4j.git - - - - Github Issue - https://github.com/opengoofy/hippo4j/issues - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2 ossrh