This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.2.x
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.2.x by this push:
new 73ad6b9 Sync master to 0.2.x (#417)
73ad6b9 is described below
commit 73ad6b9f8354eed237dcf125a3fdace0d3d063b8
Author: Mercy Ma <[email protected]>
AuthorDate: Sun Jan 27 20:54:15 2019 +0800
Sync master to 0.2.x (#417)
* 0.2.1 release (#402)
* 0.2.1 (#345)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* 0.2.1 (#346)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* 0.2.1 (#357)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* 0.2.1 (#360)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* Add the samples of Zookeeper and Nacos
* Update README.md
* Fix the test cases
* 0.2.1 (#367)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* Add the samples of Zookeeper and Nacos
* Update README.md
* Fix the test cases
* Polish apache/incubator-dubbo-spring-boot-project#366
* 0.2.1 (#372) (#374)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* Add the samples of Zookeeper and Nacos
* Update README.md
* Fix the test cases
* Polish apache/incubator-dubbo-spring-boot-project#366
* Polish apache/incubator-dubbo-spring-boot-project#370
* 0.2.1 (#378)
* 0.2.1 (#372)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* Add the samples of Zookeeper and Nacos
* Update README.md
* Fix the test cases
* Polish apache/incubator-dubbo-spring-boot-project#366
* Polish apache/incubator-dubbo-spring-boot-project#370
* 0.2.1 (#376)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* Add the samples of Zookeeper and Nacos
* Update README.md
* Fix the test cases
* Polish apache/incubator-dubbo-spring-boot-project#366
* Polish apache/incubator-dubbo-spring-boot-project#370
* Polish apache/incubator-dubbo-spring-boot-project#370
* 0.2.1 (#389)
* 0.2.1 (#372)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* Add the samples of Zookeeper and Nacos
* Update README.md
* Fix the test cases
* Polish apache/incubator-dubbo-spring-boot-project#366
* Polish apache/incubator-dubbo-spring-boot-project#370
* 0.2.1 (#376)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* Add the samples of Zookeeper and Nacos
* Update README.md
* Fix the test cases
* Polish apache/incubator-dubbo-spring-boot-project#366
* Polish apache/incubator-dubbo-spring-boot-project#370
* Polish apache/incubator-dubbo-spring-boot-project#370
* 0.2.1 (#386)
* Fix apache/incubator-dubbo-spring-boot-project#169
* Polish : apache/incubator-dubbo-spring-boot-project#324 &
apache/incubator-dubbo-spring-boot-project#325
* Polish : apache/incubator-dubbo-spring-boot-project#315
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321
* Polish : apache/incubator-dubbo-spring-boot-project#321 for test case
* Polish : Update Demos
* Polish : Update version to be 0.2.1
* Polish : apache/incubator-dubbo-spring-boot-project#319
* Polish : apache/incubator-dubbo-spring-boot-project#226
* Polish : apache/incubator-dubbo-spring-boot-project#309
* Fix the test case's bugs
* Fix the test case's bugs
* Fix a JavaDoc issue
* Update SNAPSHOT and add exclude list
* Update SNAPSHOT to be 0.2.1-SNAPSHOT
* Update JDK versions
* Update JDK versions
* Reactor & remove author info
* Refactor : to save a shutdown hook thread
* Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class
conflict, and use indirectly dependencies from spring-boot-starter-*
* Polish apache/incubator-dubbo-spring-boot-project#341
* Add the samples
* Add a license
* Add the samples of Zookeeper and Nacos
* Update README.md
* Fix the test cases
* Polish apache/incubator-dubbo-spring-boot-project#366
* Polish apache/incubator-dubbo-spring-boot-project#370
* Polish apache/incubator-dubbo-spring-boot-project#370
* Add NOTICE and DISCLAIMER
* Add Java11 support #383 (#393)
* Upgrade jacoco to version 0.8.2 #383
* Update travis setting
add openjdk11
remove openjdk10 openjdk9
* Update mailing list address (#380)
* Update README [user guide] link (#348)
* Remove spring.providers file from starter module (#403) (#404)
* remove spring.providers file since it's only used by STS IDE
* deep search in project, no useage
* add @Override annotation (#409)
* to method reference (#410)
* add @Override annotation
* modify method reference
* Update README.md
* Update README_CN.md
* Update README_CN.md
* Update README.md
---
.travis.yml | 3 +-
README.md | 16 ++--
README_CN.md | 99 +++++++++++++---------
.../dubbo/actuate/endpoint/DubboEndpointTest.java | 2 +-
.../com/alibaba/boot/dubbo/util/DubboUtils.java | 2 +-
.../alibaba/boot/dubbo/util/DubboUtilsTest.java | 2 +-
dubbo-spring-boot-parent/pom.xml | 2 +-
.../DubboAutoConfigurationConsumerBootstrap.java | 4 +-
.../demo/provider/service/DefaultDemoService.java | 1 +
.../DubboRegistryNacosConsumerBootstrap.java | 4 +-
.../demo/provider/service/DefaultDemoService.java | 1 +
.../DubboRegistryZooKeeperConsumerBootstrap.java | 4 +-
.../demo/provider/service/DefaultDemoService.java | 1 +
...ExternalizedConfigurationConsumerBootstrap.java | 4 +-
.../demo/provider/service/DefaultDemoService.java | 1 +
.../src/main/resources/META-INF/spring.provides | 1 -
16 files changed, 79 insertions(+), 68 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 71e2032..041395b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,7 @@ language: java
sudo: false # faster builds
jdk:
- - openjdk10
- - openjdk9
+ - openjdk11
- oraclejdk8
script: "mvn clean package"
diff --git a/README.md b/README.md
index 34ca0d3..0e03ca5 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to
your project by addi
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>0.2.1-SNAPSHOT</version>
+ <version>0.2.1</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
@@ -104,14 +104,14 @@ If you'd like to attempt to experience latest features,
you also can build from
| versions | Java | Spring Boot | Dubbo |
| -------- | ----- | ----------- | ---------- |
-| `0.2.1` | 1.8+ | `2.1.x` | `2.6.2` + |
-| `0.1.1` | 1.7+ | `1.5.x` | `2.6.2` + |
+| `0.2.1` | 1.8+ | `2.1.x` | `2.6.5` + |
+| `0.1.1` | 1.7+ | `1.5.x` | `2.6.5` + |
## Getting Started
-If you don't know about Dubbo, please take a few minutes to learn
http://dubbo.apache.org/. After that you could dive deep into dubbo [user
guide](http://dubbo.apache.org/books/dubbo-user-book-en/).
+If you don't know about Dubbo, please take a few minutes to learn
http://dubbo.apache.org/. After that you could dive deep into dubbo [user
guide](http://dubbo.apache.org/en-us/docs/user/quick-start.html).
Usually, There are two usage scenarios for Dubbo applications, one is Dubbo
service(s) provider, another is Dubbo service(s) consumer, thus let's get a
quick start on them.
@@ -238,9 +238,9 @@ More details, please refer to
[Samples](dubbo-spring-boot-samples).
Having trouble with Dubbo Spring Boot? We’d like to help!
-- If you are upgrading, read the [release
notes](https://github.com/dubbo/dubbo-spring-boot-project/releases) for upgrade
instructions and "new and noteworthy" features.
-- Ask a question - You can join [ours google
groups](https://groups.google.com/group/dubbo), or subscribe [Dubbo User
Mailling List](mailto:[email protected]).
-- Report bugs at
[github.com/dubbo/dubbo-spring-boot-project/issues](https://github.com/dubbo/dubbo-spring-boot-project/issues).
+- If you are upgrading, read the [release
notes](https://github.com/apache/incubator-dubbo-spring-boot-project/releases)
for upgrade instructions and "new and noteworthy" features.
+- Ask a question - You can subscribe [Dubbo User Mailling
List](mailto:[email protected]).
+- Report bugs at
[issues](https://github.com/apache/incubator-dubbo-spring-boot-project/issues).
@@ -293,4 +293,4 @@ The samples project of Dubbo Spring Boot that includes:
- [Externalized Configuration
Samples](dubbo-spring-boot-samples/externalized-configuration-samples)
- [Registry Zookeeper
Samples](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples)
- [Registry Nacos
Samples](dubbo-spring-boot-samples/dubbo-registry-nacos-samples)
-- [Sample API](dubbo-spring-boot-samples/sample-api)
\ No newline at end of file
+- [Sample API](dubbo-spring-boot-samples/sample-api)
diff --git a/README_CN.md b/README_CN.md
index 85a320d..7451ae4 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -23,24 +23,50 @@
您可以为您的工程引入最新 `dubbo-spring-boot-starter` 的发布，增加以下依赖到工程的 `pom.xml` 文件中：
```xml
-<dependency>
- <groupId>com.alibaba.boot</groupId>
- <artifactId>dubbo-spring-boot-starter</artifactId>
- <version>0.2.1</version>
-</dependency>
-
-<!-- Dubbo -->
-<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo</artifactId>
- <version>2.6.5</version>
-</dependency>
-<!-- Spring Context Extras -->
-<dependency>
- <groupId>com.alibaba.spring</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>1.0.2</version>
-</dependency>
+<properties>
+ <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
+ <dubbo.version>2.6.5</dubbo.version>
+</properties>
+
+<dependencyManagement>
+ <dependencies>
+ <!-- Spring Boot -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Dubbo dependencies -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-dependencies-bom</artifactId>
+ <version>${dubbo.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+</dependencyManagement>
+
+<dependencies>
+ <!-- Dubbo Spring Boot Starter -->
+ <dependency>
+ <groupId>com.alibaba.boot</groupId>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
+ <version>0.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>${dubbo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
+</dependencies>
```
如果您的工程遇到了依赖问题, 请尝试添加如下 Maven 参考到工程的 `pom.xml` 文件中：
@@ -78,16 +104,16 @@
### 依赖关系
-| 版本 | Java | Spring Boot | Dubbo |
-| -------- | ----- | ----------------- | ---------- |
-| `0.2.0` | 1.8+ | `2.0.x` | `2.6.2`+ |
-| `0.1.1` | 1.7+ | `1.5.x` | `2.6.2`+ |
+| versions | Java | Spring Boot | Dubbo |
+| -------- | ----- | ----------- | ---------- |
+| `0.2.1` | 1.8+ | `2.1.x` | `2.6.5` + |
+| `0.1.1` | 1.7+ | `1.5.x` | `2.6.5` + |
## 快速开始
-如果您对 Dubbo 不是非常了解，耽误您几分钟访问 http://dubbo.apache.org/
。了解后，如果你期望更深入的探讨，可以移步[用户手册](http://dubbo.apache.org/books/dubbo-user-book/)。
+如果您对 Dubbo 不是非常了解，耽误您几分钟访问 http://dubbo.apache.org/
。了解后，如果你期望更深入的探讨，可以移步[用户手册](http://dubbo.apache.org/zh-cn/docs/user/quick-start.html)。
通常情况 , Dubbo 应用有两种使用场景 , 其一为 Dubbo 服务提供方 , 另外一个是 Dubbo
服务消费方，当然也允许两者混合，下面我们一起快速开始！
@@ -251,9 +277,9 @@ dubbo.protocol.port = 12345
如果您在使用 Dubbo Spring Boot 中遇到任何问题或者有什么建议? 我们非常需要您的支持!
--
如果您需要升级版本，请提前阅读[发布公告](https://github.com/dubbo/dubbo-spring-boot-project/releases)，了解最新的特性和问题修复。
-- 如果您遇到任何问题 ，您可以加入官方 [Google 讨论组](https://groups.google.com/group/dubbo) ,
或者订阅 [Dubbo 用户邮件列表](mailto:[email protected])。
-- 问题反馈，您可以在
[issues](https://github.com/dubbo/dubbo-spring-boot-project/issues) 提出您遇到的使用问题。
+-
如果您需要升级版本，请提前阅读[发布公告](https://github.com/apache/incubator-dubbo-spring-boot-project/releases)，了解最新的特性和问题修复。
+- 如果您遇到任何问题 ，您可以订阅 [Dubbo
用户邮件列表](mailto:mailto:[email protected])。
+- 问题反馈，您可以在
[issues](https://github.com/apache/incubator-dubbo-spring-boot-project/issues)
提出您遇到的使用问题。
@@ -290,19 +316,10 @@ Dubbo Spring Boot 采用多 Maven 模块工程 , 模块如下：
### [dubbo-spring-boot-samples](dubbo-spring-boot-samples)
-The samples project of Dubbo Spring Boot that includes two parts:
-[dubbo-spring-boot-samples](dubbo-spring-boot-samples) 为 Dubbo Spring Boot
示例工程，包括：
+示例工程包含以下项目:
-
-#### [Dubbo
服务提供方示例](dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider)
-
-Dubbo 服务将会通过 localhost 的 `12345` 端口暴露服务，并且提供 JMX Endpoints。
-
-
-#### [Dubbo
服务消费方示例](dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer)
-
-Dubbo 服务将被 Spring WebMVC `Controller` 消费，并且提供 JMX 以及 Web Endpoints 端口：
-
-* 示例 `Controller` : http://localhost:8080/sayHello?name=HelloWorld
-* [健康检查](dubbo-spring-boot-actuator#health-checks) :
http://localhost:8081/actuator/health
-* [Dubbo Endpoints](dubbo-spring-boot-actuator#endpoints) :
http://localhost:8081/actuator/dubbo
+- [自动装配示例](dubbo-spring-boot-samples/auto-configure-samples)
+- [外部化示例](dubbo-spring-boot-samples/externalized-configuration-samples)
+- [整合 Zookeeper 示例](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples)
+- [整合 Nacos 示例](dubbo-spring-boot-samples/dubbo-registry-nacos-samples)
+- [示例 API](dubbo-spring-boot-samples/sample-api)
diff --git
a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
index ac2b049..0cdfb21 100644
---
a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
+++
b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
@@ -65,7 +65,7 @@ public class DubboEndpointTest {
Assert.assertEquals(getVersion(), versions.get("dubbo"));
Assert.assertEquals("https://github.com/apache/incubator-dubbo";,
urls.get("dubbo"));
- Assert.assertEquals("[email protected]",
urls.get("mailing-list"));
+ Assert.assertEquals("[email protected]", urls.get("mailing-list"));
Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project";,
urls.get("github"));
Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project/issues";,
urls.get("issues"));
Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project.git";,
urls.get("git"));
diff --git
a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java
b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java
index 76ee689..59cde99 100644
---
a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java
+++
b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java
@@ -111,7 +111,7 @@ public abstract class DubboUtils {
/**
* The google group URL of Dubbo
*/
- public static final String DUBBO_MAILING_LIST =
"[email protected]";
+ public static final String DUBBO_MAILING_LIST = "[email protected]";
/**
* Filters Dubbo Properties from {@link ConfigurableEnvironment}
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java
index 066cce5..c972dc8 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java
@@ -67,7 +67,7 @@ public class DubboUtilsTest {
Assert.assertEquals("https://github.com/apache/incubator-dubbo";,
DUBBO_GITHUB_URL);
- Assert.assertEquals("[email protected]",
DUBBO_MAILING_LIST);
+ Assert.assertEquals("[email protected]", DUBBO_MAILING_LIST);
Assert.assertFalse(DEFAULT_MULTIPLE_CONFIG_PROPERTY_VALUE);
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index d2f44de..c583e0f 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -51,7 +51,7 @@
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
- <maven-jacoco-plugin.version>0.8.1</maven-jacoco-plugin.version>
+ <maven-jacoco-plugin.version>0.8.2</maven-jacoco-plugin.version>
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
diff --git
a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java
b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java
index d84b96e..c83754a 100644
---
a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java
+++
b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java
@@ -41,9 +41,7 @@ public class DubboAutoConfigurationConsumerBootstrap {
@Bean
public ApplicationRunner runner() {
- return args -> {
- logger.info(demoService.sayHello("mercyblitz"));
- };
+ return args -> logger.info(demoService.sayHello("mercyblitz"));
}
public static void main(String[] args) {
diff --git
a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
index 01dfccc..20fe666 100644
---
a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
+++
b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
@@ -36,6 +36,7 @@ public class DefaultDemoService implements DemoService {
@Value("${dubbo.application.name}")
private String serviceName;
+ @Override
public String sayHello(String name) {
return String.format("[%s] : Hello, %s", serviceName, name);
}
diff --git
a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java
b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java
index 408fe5e..68b690f 100644
---
a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java
+++
b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java
@@ -39,9 +39,7 @@ public class DubboRegistryNacosConsumerBootstrap {
@Bean
public ApplicationRunner runner() {
- return args -> {
- logger.info(demoService.sayHello("mercyblitz"));
- };
+ return args -> logger.info(demoService.sayHello("mercyblitz"));
}
public static void main(String[] args) {
diff --git
a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
index f1d9ae1..fcd3aa5 100644
---
a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
+++
b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
@@ -36,6 +36,7 @@ public class DefaultDemoService implements DemoService {
@Value("${dubbo.application.name}")
private String serviceName;
+ @Override
public String sayHello(String name) {
return String.format("[%s] : Hello, %s", serviceName, name);
}
diff --git
a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java
b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java
index 1b7935b..e238028 100644
---
a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java
+++
b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java
@@ -39,9 +39,7 @@ public class DubboRegistryZooKeeperConsumerBootstrap {
@Bean
public ApplicationRunner runner() {
- return args -> {
- logger.info(demoService.sayHello("mercyblitz"));
- };
+ return args -> logger.info(demoService.sayHello("mercyblitz"));
}
public static void main(String[] args) {
diff --git
a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
index f1d9ae1..fcd3aa5 100644
---
a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
+++
b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
@@ -36,6 +36,7 @@ public class DefaultDemoService implements DemoService {
@Value("${dubbo.application.name}")
private String serviceName;
+ @Override
public String sayHello(String name) {
return String.format("[%s] : Hello, %s", serviceName, name);
}
diff --git
a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java
b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java
index 2eb78b4..2b3778d 100644
---
a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java
+++
b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java
@@ -39,9 +39,7 @@ public class DubboExternalizedConfigurationConsumerBootstrap {
@Bean
public ApplicationRunner runner() {
- return args -> {
- logger.info(demoService.sayHello("mercyblitz"));
- };
+ return args -> logger.info(demoService.sayHello("mercyblitz"));
}
public static void main(String[] args) {
diff --git
a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
index f1d9ae1..fcd3aa5 100644
---
a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
+++
b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
@@ -36,6 +36,7 @@ public class DefaultDemoService implements DemoService {
@Value("${dubbo.application.name}")
private String serviceName;
+ @Override
public String sayHello(String name) {
return String.format("[%s] : Hello, %s", serviceName, name);
}
diff --git
a/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides
b/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index 5ea3fc3..0000000
--- a/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: dubbo-spring-boot-autoconfigure,dubbo
\ No newline at end of file
