You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by me...@apache.org on 2020/05/25 07:54:32 UTC
[dubbo-spring-boot-project] 02/02: Merge branch 'mercyblitz-2.7.x'
into 2.7.x
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
commit d1e5055e406ffeb249bb06a59c733506a939f7d9
Merge: 62629ee 50996fb
Author: mercyblitz <me...@gmail.com>
AuthorDate: Mon May 25 15:54:10 2020 +0800
Merge branch 'mercyblitz-2.7.x' into 2.7.x
.../auto-configure-samples/consumer-sample/pom.xml | 2 +-
.../auto-configure-samples/pom.xml | 2 +-
.../auto-configure-samples/provider-sample/pom.xml | 2 +-
.../consumer-sample/pom.xml | 2 +-
.../externalized-configuration-samples/pom.xml | 2 +-
.../provider-sample/pom.xml | 2 +-
dubbo-spring-boot-samples/pom.xml | 4 +-
.../nacos-samples}/consumer-sample/pom.xml | 4 +-
.../DubboRegistryNacosConsumerBootstrap.java | 0
.../src/main/resources/application.yml | 0
.../nacos-samples}/pom.xml | 7 ++-
.../nacos-samples}/provider-sample/pom.xml | 2 +-
.../DubboRegistryNacosProviderBootstrap.java | 0
.../demo/provider/service/DefaultDemoService.java | 0
.../src/main/resources/application.properties | 0
dubbo-spring-boot-samples/registry-samples/pom.xml | 23 +++++++++
.../zookeeper-samples}/consumer-sample/pom.xml | 2 +-
.../DubboRegistryZooKeeperConsumerBootstrap.java | 0
.../src/main/resources/application.yml | 0
.../zookeeper-samples}/pom.xml | 4 +-
.../zookeeper-samples}/provider-sample/pom.xml | 2 +-
.../DubboRegistryZooKeeperProviderBootstrap.java | 0
.../demo/provider/service/DefaultDemoService.java | 0
.../src/main/resources/application.properties | 0
dubbo-spring-boot-samples/sample-api/pom.xml | 2 +-
.../nacos-samples}/consumer-sample/pom.xml | 35 +++++++-------
...acosServiceIntrospectionConsumerBootstrap.java} | 6 +--
.../src/main/resources/application.yml | 4 +-
.../nacos-samples/pom.xml | 23 +++++++++
.../nacos-samples/provider-sample}/pom.xml | 35 +++++++-------
...acosServiceIntrospectionProviderBootstrap.java} | 10 ++--
.../provider/service/DefaultDemoService.java | 2 +-
.../src/main/resources/application.properties | 6 +--
.../service-introspection-samples/pom.xml | 22 +++++++++
.../zookeeper-samples}/consumer-sample/pom.xml | 56 +++++++++++-----------
...eperServiceIntrospectionConsumerBootstrap.java} | 6 +--
.../src/main/resources/application.yml | 4 +-
.../zookeeper-samples/pom.xml | 23 +++++++++
.../zookeeper-samples/provider-sample}/pom.xml | 56 +++++++++++-----------
...eperServiceIntrospectionProviderBootstrap.java} | 10 ++--
.../provider/service/DefaultDemoService.java | 2 +-
.../src/main/resources/application.properties | 24 ++++++++++
42 files changed, 249 insertions(+), 137 deletions(-)