This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 260d248297848a7f2c46cdc1fb32bf8209575c4c Merge: ee9d01a6e0 7705811ff5 Author: Albumen Kevin <[email protected]> AuthorDate: Sat Nov 12 14:42:05 2022 +0800 Merge branch 'apache-3.1' into apache-3.2 # Conflicts: # dubbo-distribution/dubbo-all/pom.xml Jenkinsfile.sonar | 8 +- .../dubbo-demo-spring-boot-consumer/pom.xml | 1 + .../dubbo-demo-spring-boot-provider/pom.xml | 1 + dubbo-distribution/dubbo-all/pom.xml | 234 +++++++--- dubbo-distribution/dubbo-bom/pom.xml | 295 +++++++++++-- ...g.apache.dubbo.registry.client.ServiceDiscovery | 1 - .../metadata/rest/ServiceRestMetadataResolver.java | 3 + dubbo-native-plugin/pom.xml | 2 +- ...istry.client.metadata.SubscribedURLsSynthesizer | 1 - dubbo-test/dubbo-dependencies-all/pom.xml | 338 ++++++++++++++ dubbo-test/{ => dubbo-test-modules}/pom.xml | 42 +- .../java/org/apache/dubbo/dependency/FileTest.java | 491 +++++++++++++++++++++ dubbo-test/pom.xml | 2 + ...g.apache.dubbo.registry.client.ServiceDiscovery | 1 - pom.xml | 8 + 15 files changed, 1279 insertions(+), 149 deletions(-) diff --cc dubbo-distribution/dubbo-all/pom.xml index 66d5f5158c,eb8efb463d..5cf0333f4c --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@@ -327,7 -385,23 +385,15 @@@ <optional>true</optional> </dependency> + <!-- xds --> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-xds</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> - <!-- Hessian Lite --> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>hessian-lite</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <!-- Transitive dependencies --> <dependency> <groupId>org.springframework</groupId>
