From ed6afe1ac34c0ddf5b3805254700488b7a7efb4d Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Mon, 8 May 2023 07:42:49 +0800 Subject: [PATCH] Use bom mode flatten (#12239) * Use bom mode flatten * Use oss * fix properties * Fix bom * Fix zk conflicts * Fix zk conflicts * Fix logger * Fix logger --- .../dubbo-demo-annotation-consumer/pom.xml | 14 ++- .../dubbo-demo-annotation-provider/pom.xml | 12 +++ .../dubbo-demo-api-consumer/pom.xml | 12 +++ .../dubbo-demo-api-provider/pom.xml | 12 +++ dubbo-demo/dubbo-demo-generic-call/pom.xml | 12 +++ dubbo-demo/dubbo-demo-interface/pom.xml | 1 + .../dubbo-demo-native-consumer/pom.xml | 91 ++++++++++++++++++ .../dubbo-demo-native-provider/pom.xml | 92 +++++++++++++++++++ .../dubbo-demo-spring-boot-consumer/pom.xml | 10 ++ .../dubbo-demo-spring-boot-provider/pom.xml | 9 ++ dubbo-demo/dubbo-demo-triple/pom.xml | 16 ++++ .../dubbo-demo-jaxrs-rest-consumer/pom.xml | 14 +++ .../dubbo-demo-jaxrs-rest-provider/pom.xml | 14 +++ .../pom.xml | 14 +++ .../pom.xml | 14 +++ .../dubbo-demo-xml-consumer/pom.xml | 14 +++ .../dubbo-demo-xml-provider/pom.xml | 16 ++++ dubbo-dependencies-bom/pom.xml | 2 +- dubbo-dependencies/pom.xml | 29 ++++++ dubbo-distribution/dubbo-bom/pom.xml | 31 +++++++ dubbo-test/dubbo-dependencies-all/pom.xml | 75 +++++++++++++++ dubbo-test/dubbo-test-check/pom.xml | 1 + dubbo-test/dubbo-test-common/pom.xml | 5 +- dubbo-test/dubbo-test-modules/pom.xml | 1 + dubbo-test/dubbo-test-spring/pom.xml | 16 +++- dubbo-test/dubbo-test-spring3.2/pom.xml | 2 +- dubbo-test/dubbo-test-spring4.1/pom.xml | 2 +- dubbo-test/dubbo-test-spring4.2/pom.xml | 2 +- dubbo-test/pom.xml | 2 +- pom.xml | 2 +- 30 files changed, 528 insertions(+), 9 deletions(-) diff --git a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml index c7f6fe3ee2..217f3edbc2 100644 --- a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml @@ -37,19 +37,22 @@ org.apache.dubbo dubbo-demo-interface - ${project.parent.version} + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -58,38 +61,47 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} diff --git a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml index 9dbe00ef2f..120bb53506 100644 --- a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml @@ -43,10 +43,12 @@ org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -55,42 +57,52 @@ org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.slf4j diff --git a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml index 5c672fa079..28b830c492 100644 --- a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml @@ -42,50 +42,62 @@ org.apache.dubbo dubbo-config-api + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} diff --git a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml index cedee67977..be8bacd43d 100644 --- a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml @@ -44,50 +44,62 @@ org.apache.dubbo dubbo-config-api + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} diff --git a/dubbo-demo/dubbo-demo-generic-call/pom.xml b/dubbo-demo/dubbo-demo-generic-call/pom.xml index 1fd332f010..4891a1e577 100644 --- a/dubbo-demo/dubbo-demo-generic-call/pom.xml +++ b/dubbo-demo/dubbo-demo-generic-call/pom.xml @@ -37,18 +37,22 @@ org.apache.dubbo dubbo-config-api + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -57,34 +61,42 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} diff --git a/dubbo-demo/dubbo-demo-interface/pom.xml b/dubbo-demo/dubbo-demo-interface/pom.xml index c906f1d1d2..802bea76a3 100644 --- a/dubbo-demo/dubbo-demo-interface/pom.xml +++ b/dubbo-demo/dubbo-demo-interface/pom.xml @@ -34,6 +34,7 @@ org.apache.dubbo dubbo-rpc-rest + ${project.version} diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml index 72fa5fe3b4..13dd0df8a2 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml @@ -30,6 +30,8 @@ true + 5.1.0 + 3.8.1 @@ -41,39 +43,97 @@ org.apache.dubbo dubbo-config-api + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} + + org.apache.curator + curator-x-discovery + ${curator5_version} + + + org.apache.curator + curator-recipes + ${curator5_version} + + + org.apache.curator + curator-framework + ${curator5_version} + + + org.apache.zookeeper + zookeeper + ${zookeeper_version} + + + io.netty + netty-handler + + + io.netty + netty-transport-native-epoll + + + + org.apache.dubbo dubbo-registry-zookeeper + ${project.version} + + + curator-x-discovery + org.apache.curator + + + zookeeper + org.apache.zookeeper + + + org.apache.curator + curator-recipes + + + org.apache.curator + curator-framework + + org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-filter-cache + ${project.version} org.apache.dubbo dubbo-filter-validation + ${project.version} org.apache.dubbo dubbo-remoting-http + ${project.version} @@ -84,8 +144,39 @@ org.apache.dubbo dubbo-native + ${project.version} + + log4j + log4j + 1.2.17 + compile + + + * + * + + + + + org.slf4j + slf4j-api + 1.7.36 + compile + + + org.slf4j + slf4j-log4j12 + 1.7.33 + compile + + + * + * + + + diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml index 6430631523..51ead01638 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml @@ -30,6 +30,8 @@ true + 5.1.0 + 3.8.1 @@ -41,38 +43,96 @@ org.apache.dubbo dubbo-config-api + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} + + org.apache.curator + curator-x-discovery + ${curator5_version} + + + org.apache.curator + curator-recipes + ${curator5_version} + + + org.apache.curator + curator-framework + ${curator5_version} + + + org.apache.zookeeper + zookeeper + ${zookeeper_version} + + + io.netty + netty-handler + + + io.netty + netty-transport-native-epoll + + + + org.apache.dubbo dubbo-registry-zookeeper + ${project.version} + + + curator-x-discovery + org.apache.curator + + + zookeeper + org.apache.zookeeper + + + org.apache.curator + curator-recipes + + + org.apache.curator + curator-framework + + org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-filter-cache + ${project.version} org.apache.dubbo dubbo-filter-validation + ${project.version} org.apache.dubbo dubbo-remoting-http + ${project.version} com.alibaba @@ -81,6 +141,38 @@ org.apache.dubbo dubbo-native + ${project.version} + + + + log4j + log4j + 1.2.17 + compile + + + * + * + + + + + org.slf4j + slf4j-api + 1.7.36 + compile + + + org.slf4j + slf4j-log4j12 + 1.7.33 + compile + + + * + * + + diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml index 89b23d6ade..7771ce1be1 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml @@ -45,41 +45,49 @@ org.apache.dubbo dubbo-spring-boot-starter + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} @@ -126,11 +134,13 @@ org.apache.dubbo dubbo-spring-boot-tracing-otel-zipkin-starter + ${project.version} org.apache.dubbo dubbo-qos + ${project.version} diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml index 083a27bcd5..ec8c54ddd8 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml @@ -45,36 +45,43 @@ org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} @@ -121,11 +128,13 @@ org.apache.dubbo dubbo-spring-boot-tracing-otel-zipkin-starter + ${project.version} org.apache.dubbo dubbo-qos + ${project.version} diff --git a/dubbo-demo/dubbo-demo-triple/pom.xml b/dubbo-demo/dubbo-demo-triple/pom.xml index 760e7db95d..7a204a368b 100644 --- a/dubbo-demo/dubbo-demo-triple/pom.xml +++ b/dubbo-demo/dubbo-demo-triple/pom.xml @@ -41,34 +41,42 @@ org.apache.dubbo dubbo-filter-cache + ${project.version} org.apache.dubbo dubbo-config-api + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-common + ${project.version} org.apache.dubbo dubbo-registry-api + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -77,18 +85,22 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo @@ -98,18 +110,22 @@ org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} com.google.protobuf diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-consumer/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-consumer/pom.xml index 78fc871305..4e76a82790 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-consumer/pom.xml @@ -49,14 +49,17 @@ org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -65,46 +68,57 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-rpc-rest + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-serialization-jdk + ${project.version} org.slf4j diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-provider/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-provider/pom.xml index 9989d45b7a..eb0aa9aa8f 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-jaxrs-rest-provider/pom.xml @@ -49,14 +49,17 @@ org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -65,46 +68,57 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-rpc-rest + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-serialization-jdk + ${project.version} org.slf4j diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml index 63c51491c7..6d9d97a333 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-consumer/pom.xml @@ -49,14 +49,17 @@ org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -65,46 +68,57 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-rpc-rest + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-serialization-jdk + ${project.version} org.slf4j diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml index 8c042046e2..60219544e0 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-spring-mvc-rest-provider/pom.xml @@ -49,14 +49,17 @@ org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -65,46 +68,57 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-rpc-rest + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-serialization-jdk + ${project.version} org.slf4j diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml index 6aa8986d94..b614dd6675 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml @@ -38,10 +38,12 @@ org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -50,50 +52,62 @@ org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-serialization-jdk + ${project.version} org.apache.dubbo dubbo-rpc-triple + ${project.version} diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml index 342ad22233..612da3c0f9 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml @@ -41,14 +41,17 @@ org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -57,46 +60,57 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-rpc-rest + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-serialization-jdk + ${project.version} org.slf4j @@ -114,10 +128,12 @@ org.apache.dubbo dubbo-rpc-triple + ${project.version} org.apache.dubbo dubbo-qos + ${project.version} diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 573f4afc9b..3f324bdddd 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -915,7 +915,7 @@ ${maven_flatten_version} true - resolveCiFriendliesOnly + bom diff --git a/dubbo-dependencies/pom.xml b/dubbo-dependencies/pom.xml index 628d9b109d..d8b8b978a4 100644 --- a/dubbo-dependencies/pom.xml +++ b/dubbo-dependencies/pom.xml @@ -31,5 +31,34 @@ dubbo-dependencies-zookeeper-curator5 + + + + org.codehaus.mojo + flatten-maven-plugin + ${maven_flatten_version} + + true + bom + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index 7fff3c56cf..030c5da628 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -579,6 +579,37 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + ${maven_flatten_version} + + true + bom + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + release diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml index 8b4ed7e5b0..d98a49f720 100644 --- a/dubbo-test/dubbo-dependencies-all/pom.xml +++ b/dubbo-test/dubbo-dependencies-all/pom.xml @@ -37,351 +37,426 @@ org.apache.dubbo dubbo-cluster + ${project.version} org.apache.dubbo dubbo-common + ${project.version} org.apache.dubbo dubbo-compatible + ${project.version} org.apache.dubbo dubbo-compiler + ${project.version} org.apache.dubbo dubbo-config-api + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-apollo + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-container-api + ${project.version} org.apache.dubbo dubbo-container-spring + ${project.version} org.apache.dubbo dubbo + ${project.version} org.apache.dubbo dubbo-filter-cache + ${project.version} org.apache.dubbo dubbo-filter-validation + ${project.version} org.apache.dubbo dubbo-kubernetes + ${project.version} org.apache.dubbo dubbo-metadata-api + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-redis + ${project.version} org.apache.dubbo dubbo-metadata-processor + ${project.version} org.apache.dubbo dubbo-metadata-definition-protobuf + ${project.version} org.apache.dubbo dubbo-metrics-api + ${project.version} org.apache.dubbo dubbo-metrics-default + ${project.version} org.apache.dubbo dubbo-metrics-registry + ${project.version} org.apache.dubbo dubbo-metrics-metadata + ${project.version} org.apache.dubbo dubbo-metrics-config-center + ${project.version} org.apache.dubbo dubbo-metrics-prometheus + ${project.version} org.apache.dubbo dubbo-monitor-api + ${project.version} org.apache.dubbo dubbo-monitor-default + ${project.version} org.apache.dubbo dubbo-native + ${project.version} org.apache.dubbo dubbo-native-plugin + ${project.version} org.apache.dubbo dubbo-maven-plugin + ${project.version} org.apache.dubbo dubbo-auth + ${project.version} org.apache.dubbo dubbo-security + ${project.version} org.apache.dubbo dubbo-qos-api + ${project.version} org.apache.dubbo dubbo-qos + ${project.version} org.apache.dubbo dubbo-spring-security + ${project.version} org.apache.dubbo dubbo-reactive + ${project.version} org.apache.dubbo dubbo-registry-api + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-multiple + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-remoting-api + ${project.version} org.apache.dubbo dubbo-remoting-http + ${project.version} org.apache.dubbo dubbo-remoting-netty + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-remoting-zookeeper + ${project.version} org.apache.dubbo dubbo-remoting-zookeeper-curator5 + ${project.version} org.apache.dubbo dubbo-rpc-api + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-rpc-injvm + ${project.version} org.apache.dubbo dubbo-rpc-rest + ${project.version} org.apache.dubbo dubbo-rpc-triple + ${project.version} org.apache.dubbo dubbo-serialization-api + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-serialization-jdk + ${project.version} org.apache.dubbo dubbo-spring-boot-actuator + ${project.version} org.apache.dubbo dubbo-spring-boot-autoconfigure + ${project.version} org.apache.dubbo dubbo-spring-boot-actuator-compatible + ${project.version} org.apache.dubbo dubbo-spring-boot-autoconfigure-compatible + ${project.version} org.apache.dubbo dubbo-spring-boot-starter + ${project.version} org.apache.dubbo dubbo-spring-boot-observability-autoconfigure + ${project.version} org.apache.dubbo dubbo-spring-boot-tracing-otel-zipkin-starter + ${project.version} org.apache.dubbo dubbo-spring-boot-tracing-brave-zipkin-starter + ${project.version} org.apache.dubbo dubbo-spring-boot-observability-starter + ${project.version} org.apache.dubbo dubbo-test-check + ${project.version} org.apache.dubbo dubbo-test-common + ${project.version} org.apache.dubbo dubbo-test-modules + ${project.version} org.apache.dubbo dubbo-test-spring + ${project.version} org.apache.dubbo dubbo-test-spring3.2 + ${project.version} org.apache.dubbo dubbo-test-spring4.1 + ${project.version} org.apache.dubbo dubbo-test-spring4.2 + ${project.version} org.apache.dubbo dubbo-xds + ${project.version} diff --git a/dubbo-test/dubbo-test-check/pom.xml b/dubbo-test/dubbo-test-check/pom.xml index 30116dd7e1..4337f6b853 100644 --- a/dubbo-test/dubbo-test-check/pom.xml +++ b/dubbo-test/dubbo-test-check/pom.xml @@ -45,6 +45,7 @@ org.apache.dubbo dubbo-common + ${project.version} org.junit.platform diff --git a/dubbo-test/dubbo-test-common/pom.xml b/dubbo-test/dubbo-test-common/pom.xml index 37c0be9919..4a8cb97d44 100644 --- a/dubbo-test/dubbo-test-common/pom.xml +++ b/dubbo-test/dubbo-test-common/pom.xml @@ -48,19 +48,22 @@ org.apache.dubbo dubbo-common + ${project.version} org.apache.dubbo dubbo-rpc-api + ${project.version} org.apache.dubbo dubbo-rpc-rest + ${project.version} org.apache.dubbo dubbo-test-check - ${project.parent.version} + ${project.version} diff --git a/dubbo-test/dubbo-test-modules/pom.xml b/dubbo-test/dubbo-test-modules/pom.xml index 3a849ee552..bcd2a99a9a 100644 --- a/dubbo-test/dubbo-test-modules/pom.xml +++ b/dubbo-test/dubbo-test-modules/pom.xml @@ -44,6 +44,7 @@ org.apache.dubbo dubbo-common + ${project.version} diff --git a/dubbo-test/dubbo-test-spring/pom.xml b/dubbo-test/dubbo-test-spring/pom.xml index bf68d680e1..9ac34620d5 100644 --- a/dubbo-test/dubbo-test-spring/pom.xml +++ b/dubbo-test/dubbo-test-spring/pom.xml @@ -53,21 +53,24 @@ org.apache.dubbo dubbo-test-common - ${project.parent.version} + ${project.version} org.apache.dubbo dubbo-registry-multicast + ${project.version} org.apache.dubbo dubbo-registry-zookeeper + ${project.version} org.apache.dubbo dubbo-registry-nacos + ${project.version} com.alibaba.nacos @@ -76,46 +79,57 @@ org.apache.dubbo dubbo-configcenter-zookeeper + ${project.version} org.apache.dubbo dubbo-configcenter-nacos + ${project.version} org.apache.dubbo dubbo-metadata-report-zookeeper + ${project.version} org.apache.dubbo dubbo-metadata-report-nacos + ${project.version} org.apache.dubbo dubbo-rpc-dubbo + ${project.version} org.apache.dubbo dubbo-rpc-rest + ${project.version} org.apache.dubbo dubbo-config-spring + ${project.version} org.apache.dubbo dubbo-remoting-netty4 + ${project.version} org.apache.dubbo dubbo-serialization-hessian2 + ${project.version} org.apache.dubbo dubbo-serialization-fastjson2 + ${project.version} org.apache.dubbo dubbo-serialization-jdk + ${project.version} org.slf4j diff --git a/dubbo-test/dubbo-test-spring3.2/pom.xml b/dubbo-test/dubbo-test-spring3.2/pom.xml index 55035a92e5..0156c22e75 100644 --- a/dubbo-test/dubbo-test-spring3.2/pom.xml +++ b/dubbo-test/dubbo-test-spring3.2/pom.xml @@ -49,7 +49,7 @@ org.apache.dubbo dubbo-test-spring - ${project.parent.version} + ${project.version} test diff --git a/dubbo-test/dubbo-test-spring4.1/pom.xml b/dubbo-test/dubbo-test-spring4.1/pom.xml index ae7aabe958..bf3a219186 100644 --- a/dubbo-test/dubbo-test-spring4.1/pom.xml +++ b/dubbo-test/dubbo-test-spring4.1/pom.xml @@ -49,7 +49,7 @@ org.apache.dubbo dubbo-test-spring - ${project.parent.version} + ${project.version} test org.apache.curator diff --git a/dubbo-test/dubbo-test-spring4.2/pom.xml b/dubbo-test/dubbo-test-spring4.2/pom.xml index f65855d3d1..cc90e8aef9 100644 --- a/dubbo-test/dubbo-test-spring4.2/pom.xml +++ b/dubbo-test/dubbo-test-spring4.2/pom.xml @@ -49,7 +49,7 @@ org.apache.dubbo dubbo-test-spring - ${project.parent.version} + ${project.version} test org.apache.curator diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 5d5a256394..ca78857b9f 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -49,7 +49,7 @@ org.apache.dubbo dubbo-bom - ${project.parent.version} + ${project.version} pom import diff --git a/pom.xml b/pom.xml index 2e4f7fd744..50359bd5c7 100644 --- a/pom.xml +++ b/pom.xml @@ -765,7 +765,7 @@ ${maven_flatten_version} true - resolveCiFriendliesOnly + oss