[dubbo-samples] branch master updated (dcc01ab6 -> fba259ff)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git


    from dcc01ab6 Add nacos merge test cases (#496)
     add fba259ff Add wildcard test cases (#480)

No new revisions were added by this update.

Summary of changes:
 .../dubbo-samples-sd-group}/case-configuration.yml | 23 ++++++++--------
 .../case-versions.conf                             |  0
 .../dubbo-samples-sd-group-api}/pom.xml            |  4 +--
 .../dubbo/samples/merge/api/MergeService.java      |  0
 .../dubbo-samples-sd-group-consumer}/pom.xml       |  6 ++--
 .../apache/dubbo/samples/merge/MergeConsumer.java  |  0
 .../apache/dubbo/samples/merge/MergeConsumer2.java |  0
 .../src/main/resources/log4j.properties            |  0
 .../src/main/resources/spring/merge-consumer.xml   |  0
 .../src/main/resources/spring/merge-consumer2.xml  |  0
 .../apache/dubbo/samples/merge/Consumer1IT.java    |  0
 .../apache/dubbo/samples/merge/Consumer2IT.java    |  0
 .../dubbo-samples-sd-group-provider1}/pom.xml      |  6 ++--
 .../apache/dubbo/samples/merge/MergeProvider.java  |  0
 .../dubbo/samples/merge/impl/MergeServiceImpl.java |  0
 .../samples/merge/impl/MergeServiceImpl2.java      |  0
 .../src/main/resources/log4j.properties            |  0
 .../src/main/resources/spring/merge-provider.xml   |  2 +-
 .../dubbo-samples-sd-group-provider2}/pom.xml      |  6 ++--
 .../apache/dubbo/samples/merge/MergeProvider2.java |  0
 .../samples/merge/impl/MergeServiceImpl3.java      |  0
 .../src/main/resources/log4j.properties            |  0
 .../src/main/resources/spring/merge-provider2.xml  |  2 +-
 .../dubbo-samples-sd-group}/pom.xml                | 14 +++++-----
 .../dubbo-samples-sd-merge}/case-configuration.yml | 23 ++++++++--------
 .../case-versions.conf                             |  0
 .../dubbo-samples-sd-merge-api}/pom.xml            |  4 +--
 .../dubbo/samples/merge/api/MergeService.java      |  0
 .../dubbo-samples-sd-merge-consumer}/pom.xml       |  6 ++--
 .../apache/dubbo/samples/merge/MergeConsumer.java  |  0
 .../apache/dubbo/samples/merge/MergeConsumer2.java |  0
 .../src/main/resources/log4j.properties            |  0
 .../src/main/resources/spring/merge-consumer.xml   |  0
 .../src/main/resources/spring/merge-consumer2.xml  |  0
 .../apache/dubbo/samples/merge/Consumer1IT.java    |  0
 .../apache/dubbo/samples/merge/Consumer2IT.java    |  0
 .../dubbo-samples-sd-merge-provider1}/pom.xml      |  6 ++--
 .../apache/dubbo/samples/merge/MergeProvider.java  |  0
 .../dubbo/samples/merge/impl/MergeServiceImpl.java |  0
 .../samples/merge/impl/MergeServiceImpl2.java      |  0
 .../src/main/resources/log4j.properties            |  0
 .../src/main/resources/spring/merge-provider.xml   |  2 +-
 .../dubbo-samples-sd-merge-provider2}/pom.xml      |  6 ++--
 .../apache/dubbo/samples/merge/MergeProvider2.java |  0
 .../samples/merge/impl/MergeServiceImpl3.java      |  0
 .../src/main/resources/log4j.properties            |  0
 .../src/main/resources/spring/merge-provider2.xml  |  2 +-
 .../dubbo-samples-sd-merge}/pom.xml                | 14 +++++-----
 .../dubbo-samples-sd-version}/README_zh.md         |  0
 .../case-configuration.yml                         | 14 +++++-----
 .../case-versions.conf                             |  0
 .../dubbo-samples-sd-version}/pom.xml              |  4 +--
 .../dubbo/samples/version/VersionConsumer.java     |  0
 .../dubbo/samples/version/VersionProvider.java     |  0
 .../dubbo/samples/version/VersionProvider2.java    |  0
 .../dubbo/samples/version/api/VersionService.java  |  0
 .../samples/version/impl/VersionServiceImpl.java   |  0
 .../samples/version/impl/VersionServiceImpl2.java  |  0
 .../src/main/resources/log4j.properties            |  0
 .../src/main/resources/spring/version-consumer.xml |  0
 .../src/main/resources/spring/version-provider.xml |  2 +-
 .../main/resources/spring/version-provider2.xml    |  2 +-
 .../dubbo/samples/version/MyNettyTransporter.java  |  0
 .../dubbo/samples/version/VersionService1IT.java   |  0
 .../dubbo/samples/version/VersionService2IT.java   |  0
 .../samples/version/VersionServiceStarIT.java      |  3 +-
 .../internal/org.apache.dubbo.remoting.Transporter |  0
 .../test/resources/spring/version-consumer-1.xml   |  0
 .../test/resources/spring/version-consumer-2.xml   |  0
 .../resources/spring/version-consumer-star.xml     |  2 +-
 dubbo-samples-boundary-test/pom.xml                |  3 ++
 .../microservices/sc/rest/UserServiceImpl.java     | 32 ----------------------
 72 files changed, 78 insertions(+), 110 deletions(-)
 copy {dubbo-samples-merge => dubbo-samples-boundary-test/dubbo-samples-sd-group}/case-configuration.yml (78%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge => dubbo-samples-sd-group}/case-versions.conf (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-api => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-api}/pom.xml (91%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-api => dubbo-samples-sd-group/dubbo-samples-sd-group-api}/src/main/java/org/apache/dubbo/samples/merge/api/MergeService.java (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-consumer => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer}/pom.xml (93%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-sd-group/dubbo-samples-sd-group-consumer}/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-sd-group/dubbo-samples-sd-group-consumer}/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer2.java (100%)
 copy {dubbo-samples-async/dubbo-samples-async-onerror => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer}/src/main/resources/log4j.properties (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-consumer => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer}/src/main/resources/spring/merge-consumer.xml (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-consumer => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-consumer}/src/main/resources/spring/merge-consumer2.xml (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-sd-group/dubbo-samples-sd-group-consumer}/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-sd-group/dubbo-samples-sd-group-consumer}/src/test/java/org/apache/dubbo/samples/merge/Consumer2IT.java (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-provider2 => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-provider1}/pom.xml (92%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider1 => dubbo-samples-sd-group/dubbo-samples-sd-group-provider1}/src/main/java/org/apache/dubbo/samples/merge/MergeProvider.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider1 => dubbo-samples-sd-group/dubbo-samples-sd-group-provider1}/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider1 => dubbo-samples-sd-group/dubbo-samples-sd-group-provider1}/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl2.java (100%)
 copy {dubbo-samples-async/dubbo-samples-async-onerror => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-provider1}/src/main/resources/log4j.properties (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-provider1 => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-provider1}/src/main/resources/spring/merge-provider.xml (96%)
 copy {dubbo-samples-merge/dubbo-samples-merge-provider2 => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-provider2}/pom.xml (92%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider2 => dubbo-samples-sd-group/dubbo-samples-sd-group-provider2}/src/main/java/org/apache/dubbo/samples/merge/MergeProvider2.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider2 => dubbo-samples-sd-group/dubbo-samples-sd-group-provider2}/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl3.java (100%)
 copy {dubbo-samples-async/dubbo-samples-async-onerror => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-provider2}/src/main/resources/log4j.properties (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-provider2 => dubbo-samples-boundary-test/dubbo-samples-sd-group/dubbo-samples-sd-group-provider2}/src/main/resources/spring/merge-provider2.xml (96%)
 copy {dubbo-samples-merge => dubbo-samples-boundary-test/dubbo-samples-sd-group}/pom.xml (89%)
 copy {dubbo-samples-merge => dubbo-samples-boundary-test/dubbo-samples-sd-merge}/case-configuration.yml (78%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge => dubbo-samples-sd-merge}/case-versions.conf (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-api => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-api}/pom.xml (91%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-api => dubbo-samples-sd-merge/dubbo-samples-sd-merge-api}/src/main/java/org/apache/dubbo/samples/merge/api/MergeService.java (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-consumer => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer}/pom.xml (93%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer}/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer}/src/main/java/org/apache/dubbo/samples/merge/MergeConsumer2.java (100%)
 copy {dubbo-samples-async/dubbo-samples-async-onerror => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer}/src/main/resources/log4j.properties (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-consumer => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer}/src/main/resources/spring/merge-consumer.xml (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-consumer => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer}/src/main/resources/spring/merge-consumer2.xml (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer}/src/test/java/org/apache/dubbo/samples/merge/Consumer1IT.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-sd-merge/dubbo-samples-sd-merge-consumer}/src/test/java/org/apache/dubbo/samples/merge/Consumer2IT.java (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-provider2 => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider1}/pom.xml (92%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider1 => dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider1}/src/main/java/org/apache/dubbo/samples/merge/MergeProvider.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider1 => dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider1}/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider1 => dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider1}/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl2.java (100%)
 copy {dubbo-samples-async/dubbo-samples-async-onerror => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider1}/src/main/resources/log4j.properties (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-provider1 => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider1}/src/main/resources/spring/merge-provider.xml (96%)
 copy {dubbo-samples-merge/dubbo-samples-merge-provider2 => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider2}/pom.xml (92%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider2 => dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider2}/src/main/java/org/apache/dubbo/samples/merge/MergeProvider2.java (100%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider2 => dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider2}/src/main/java/org/apache/dubbo/samples/merge/impl/MergeServiceImpl3.java (100%)
 copy {dubbo-samples-async/dubbo-samples-async-onerror => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider2}/src/main/resources/log4j.properties (100%)
 copy {dubbo-samples-merge/dubbo-samples-merge-provider2 => dubbo-samples-boundary-test/dubbo-samples-sd-merge/dubbo-samples-sd-merge-provider2}/src/main/resources/spring/merge-provider2.xml (96%)
 copy {dubbo-samples-merge => dubbo-samples-boundary-test/dubbo-samples-sd-merge}/pom.xml (89%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/README_zh.md (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/case-configuration.yml (84%)
 copy dubbo-samples-boundary-test/{dubbo-samples-nacos-merge => dubbo-samples-sd-version}/case-versions.conf (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/pom.xml (97%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/java/org/apache/dubbo/samples/version/VersionConsumer.java (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/java/org/apache/dubbo/samples/version/VersionProvider.java (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/java/org/apache/dubbo/samples/version/VersionProvider2.java (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/java/org/apache/dubbo/samples/version/api/VersionService.java (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/java/org/apache/dubbo/samples/version/impl/VersionServiceImpl.java (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/java/org/apache/dubbo/samples/version/impl/VersionServiceImpl2.java (100%)
 copy {dubbo-samples-callback => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/resources/log4j.properties (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/resources/spring/version-consumer.xml (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/resources/spring/version-provider.xml (96%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/main/resources/spring/version-provider2.xml (96%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/test/java/org/apache/dubbo/samples/version/MyNettyTransporter.java (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/test/java/org/apache/dubbo/samples/version/VersionService1IT.java (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/test/java/org/apache/dubbo/samples/version/VersionService2IT.java (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/test/java/org/apache/dubbo/samples/version/VersionServiceStarIT.java (98%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/test/resources/spring/version-consumer-1.xml (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/test/resources/spring/version-consumer-2.xml (100%)
 copy {dubbo-samples-version => dubbo-samples-boundary-test/dubbo-samples-sd-version}/src/test/resources/spring/version-consumer-star.xml (98%)
 delete mode 100644 dubbo-samples-cloud-native/dubbo-call-sc/dubbo-sc-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserServiceImpl.java


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org