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:30 UTC

[dubbo-spring-boot-project] branch 2.7.x updated (62629ee -> d1e5055)

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

mercyblitz pushed a change to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git.


    from 62629ee  [Refactor] Using @DubboReferece and @DubboService (#714)
     add 877c9ef  Merge pull request #5 from apache/master
     add 515164e  Merge pull request #6 from mercyblitz/master
     add eb9e8a6  Update revision to be 2.7.2-SNAPSHOT
     add cddcd95  Polish apache/dubbo-spring-boot-project#494 : AwaitingNonWebApplicationListener should wait one in Hierarchical Spring Application Contexts
     add e740196  Polish apache/dubbo-spring-boot-project#496 : Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496
     add ee223ec  Polish apache/dubbo-spring-boot-project#494 : AwaitingNonWebApplicationListener should wait one in Hierarchical Spring Application Contexts
     add 0203caf  Polish apache/dubbo-spring-boot-project#496 : Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496
     add bb5f8d9  Polish apache/dubbo-spring-boot-project#553 : Upgrade the dependencies for Dubbo Spring Boot 2.7.2
     add 33b8ed8  Polish apache/dubbo-spring-boot-project#553 : Upgrade Spring Boot to be 2.1.6.RELEASE
     add 24ff965  Polish apache/dubbo-spring-boot-project#554 : To change the Dependencies of dubbo to be direct
     add 7095840  Polish apache/dubbo-spring-boot-project#560 : [QA] Fix the bugs of test cases
     add d0eebc7  Polish apache/dubbo-spring-boot-project#561 : [Version] Upgrade Dubbo 2.7.3
     add 4b1b865  Polish apache/dubbo-spring-boot-project#555 : Add the Maven profiles to test the compatibility for Spring Boot versions
     add 871251a  Polish apache/dubbo-spring-boot-project#555 : [Feature] Add the Maven profiles to test the compatibility for Spring Boot versions
     add 4816758  Update Documents' version
     add 5ca5018  Merge branch '2.7.x' into 2.7.x
     add bc38480  Fix the bugs of Test cases
     add f0d5dec  Merge remote-tracking branch 'upstream/2.7.x' into 2.7.x
     add b73a7e3  Fix the bugs of Test cases
     add ea56e86  Polish apache/dubbo-spring-boot-project#569 : DISCLAIMER can be removed
     add 9bc8201  Polish apache/dubbo-spring-boot-project#571 : Remove incubating and DISCLAIMER
     add 6cd2de5  Polish apache/dubbo-spring-boot-project#496 : [Issue] Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496
     add 8a620ca  Polish apache/dubbo-spring-boot-project#496 : Fixes the test cases
     add a40aca1  Merge remote-tracking branch 'upstream/master' into 2.7.x
     add c2c813a  Polish apache/dubbo-spring-boot-project#607
     add 79d1691  Polish apache/dubbo-spring-boot-project#619
     add f92c194  Merge branch '2.7.x' into 2.7.x
     add 6d438f1  Merge remote-tracking branch 'origin/2.7.x' into 2.7.x
     add f0d68c2  Polish
     add e0d0378  Polish apache/dubbo-spring-boot-project#635 : [Infrastructure] Upgrade Dubbo 2.7.5
     add b50ed60  Update the maven-javadoc-plugin to be 3.1.1
     add fa4fdee  Polish apache/dubbo-spring-boot-project#636 : [Infrastructure] Upgrade Spring Boot 2.x
     add 3565266  Polish apache/dubbo-spring-boot-project#637 : [Infrastructure] Upgrade Spring Boot 1.5.x
     add 76dc1ee  Polish apache/dubbo-spring-boot-project#638
     add 4430093  Polish apache/dubbo-spring-boot-project#638
     add c233e17  Polish apache/dubbo-spring-boot-project#638
     add cd98762  Polish apache/dubbo-spring-boot-project#642
     add 25a6296  Correct words
     add 1e35339  Merge remote-tracking branch 'upstream/master' into 2.7.x
     add 37cb4af  Merge remote-tracking branch 'upstream/master' into 2.7.x
     add d69bb6d  Polish apache/dubbo-spring-boot-project#647
     add b39f420  Polish apache/dubbo-spring-boot-project#648 : Remove the external project files
     add 43c0534  Merge remote-tracking branch 'upstream/master' into 2.7.x
     add 7836638  Polish apache/dubbo-spring-boot-project#688 : [Infrastructure] Upgrade Apache Dubbo 2.7.6
     add f52286a  Merge remote-tracking branch 'upstream/2.7.x' into 2.7.x
     add 0774423  Update the samples
     add c4e5340  Update the samples
     add b66f0cc  Update the samples and documents
     add a0d88b7  2.7.x (#691)
     add f6251cb  Fix #692
     add 35568ff  Remove deprecated sudo setting. (#707)
     add 9ef994d  Merge remote-tracking branch 'upstream/master' into 2.7.x
     add 09fd582  Polish apache/dubbo-spring-boot-project#711 : [Infrastructure] Dependency upgrades for 2.7.7
     add 62f6d9a  Polish apache/dubbo-spring-boot-project#711 : [Infrastructure] Dependency upgrades for 2.7.7
     add a282847  Polish apache/dubbo-spring-boot-project#713 : [Refactor] Using @DubboReferece and @DubboService
     add c7952be  Merge branch '2.7.x' into 2.7.x
     add be01fa6  Merge remote-tracking branch 'origin/2.7.x' into 2.7.x
     add b00c091  Merge remote-tracking branch 'upstream/2.7.x' into 2.7.x
     add 8613a82  Polish apache/dubbo-spring-boot-project#715 : [Samples] Adding the service-introspection samples
     add 2608b39  Polish apache/dubbo-spring-boot-project#715 : [Samples] Adding the service-introspection samples
     new 50996fb  Merge branch '2.7.x' of https://github.com/mercyblitz/dubbo-spring-boot-project into mercyblitz-2.7.x
     new d1e5055  Merge branch 'mercyblitz-2.7.x' into 2.7.x

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../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} | 11 +++--
 .../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, 250 insertions(+), 137 deletions(-)
 copy dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => registry-samples/nacos-samples}/consumer-sample/pom.xml (96%)
 copy dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => registry-samples/nacos-samples}/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java (100%)
 copy dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => registry-samples/nacos-samples}/consumer-sample/src/main/resources/application.yml (100%)
 rename dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => registry-samples/nacos-samples}/pom.xml (91%)
 rename dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => registry-samples/nacos-samples}/provider-sample/pom.xml (96%)
 copy dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => registry-samples/nacos-samples}/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboRegistryNacosProviderBootstrap.java (100%)
 copy dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => registry-samples/nacos-samples}/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java (100%)
 copy dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => registry-samples/nacos-samples}/provider-sample/src/main/resources/application.properties (100%)
 create mode 100644 dubbo-spring-boot-samples/registry-samples/pom.xml
 rename dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => registry-samples/zookeeper-samples}/consumer-sample/pom.xml (96%)
 copy dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => registry-samples/zookeeper-samples}/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java (100%)
 copy dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => registry-samples/zookeeper-samples}/consumer-sample/src/main/resources/application.yml (100%)
 rename dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => registry-samples/zookeeper-samples}/pom.xml (92%)
 rename dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => registry-samples/zookeeper-samples}/provider-sample/pom.xml (97%)
 rename dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => registry-samples/zookeeper-samples}/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboRegistryZooKeeperProviderBootstrap.java (100%)
 rename dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => registry-samples/zookeeper-samples}/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java (100%)
 rename dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => registry-samples/zookeeper-samples}/provider-sample/src/main/resources/application.properties (100%)
 copy dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => service-introspection-samples/nacos-samples}/consumer-sample/pom.xml (68%)
 rename dubbo-spring-boot-samples/{dubbo-registry-nacos-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java => service-introspection-samples/nacos-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/sample/consumer/bootstrap/DubboNacosServiceIntrospectionConsumerBootstrap.java} (88%)
 rename dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => service-introspection-samples/nacos-samples}/consumer-sample/src/main/resources/application.yml (64%)
 create mode 100644 dubbo-spring-boot-samples/service-introspection-samples/nacos-samples/pom.xml
 copy dubbo-spring-boot-samples/{dubbo-registry-nacos-samples/consumer-sample => service-introspection-samples/nacos-samples/provider-sample}/pom.xml (68%)
 copy dubbo-spring-boot-samples/{externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboExternalizedConfigurationProviderBootstrap.java => service-introspection-samples/nacos-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/sample/provider/bootstrap/DubboNacosServiceIntrospectionProviderBootstrap.java} (77%)
 copy dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo => service-introspection-samples/nacos-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/sample}/provider/service/DefaultDemoService.java (95%)
 rename dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => service-introspection-samples/nacos-samples}/provider-sample/src/main/resources/application.properties (67%)
 create mode 100644 dubbo-spring-boot-samples/service-introspection-samples/pom.xml
 copy dubbo-spring-boot-samples/{dubbo-registry-nacos-samples => service-introspection-samples/zookeeper-samples}/consumer-sample/pom.xml (60%)
 rename dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java => service-introspection-samples/zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/sample/consumer/bootstrap/DubboZooKeeperServiceIntrospectionConsumerBootstrap.java} (87%)
 rename dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples => service-introspection-samples/zookeeper-samples}/consumer-sample/src/main/resources/application.yml (53%)
 create mode 100644 dubbo-spring-boot-samples/service-introspection-samples/zookeeper-samples/pom.xml
 rename dubbo-spring-boot-samples/{dubbo-registry-nacos-samples/consumer-sample => service-introspection-samples/zookeeper-samples/provider-sample}/pom.xml (60%)
 rename dubbo-spring-boot-samples/{dubbo-registry-nacos-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboRegistryNacosProviderBootstrap.java => service-introspection-samples/zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/sample/provider/bootstrap/DubboZookeeperServiceIntrospectionProviderBootstrap.java} (75%)
 rename dubbo-spring-boot-samples/{dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo => service-introspection-samples/zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/sample}/provider/service/DefaultDemoService.java (95%)
 create mode 100644 dubbo-spring-boot-samples/service-introspection-samples/zookeeper-samples/provider-sample/src/main/resources/application.properties


[dubbo-spring-boot-project] 02/02: Merge branch 'mercyblitz-2.7.x' into 2.7.x

Posted by me...@apache.org.
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(-)


[dubbo-spring-boot-project] 01/02: Merge branch '2.7.x' of https://github.com/mercyblitz/dubbo-spring-boot-project into mercyblitz-2.7.x

Posted by me...@apache.org.
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 50996fbbba6e6475838fe0a67495c66ed8c73ea8
Merge: 62629ee 2608b39
Author: mercyblitz <me...@gmail.com>
AuthorDate: Mon May 25 15:53:31 2020 +0800

    Merge branch '2.7.x' of https://github.com/mercyblitz/dubbo-spring-boot-project into mercyblitz-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(-)