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/01/03 07:23:52 UTC
[dubbo-spring-boot-project] branch master updated: [Release] 2.7.5
(#644) (#650)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new bd3b731 [Release] 2.7.5 (#644) (#650)
bd3b731 is described below
commit bd3b7314f50e5cb2b2d4906717046201038f02e9
Author: Mercy Ma <me...@gmail.com>
AuthorDate: Fri Jan 3 15:23:42 2020 +0800
[Release] 2.7.5 (#644) (#650)
* 2.7.x (#475)
* Fix apache/incubator-dubbo-spring-boot-project#169
* 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
* 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
* 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
* Update README.md
* Update README_CN.md
* Replace ${project.version} to ${revision} in the "pom.xml" files
* Update <projectId>
* Update README.md
* Update README_CN.md
* 0.2.x (#422)
* 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
* Replace ${project.version} to ${revision} in the "pom.xml" files
* Update <projectId>
* 1.0.0 (#429)
* Polish apache/incubator-dubbo-spring-boot-project#395
* Polish apache/incubator-dubbo-spring-boot-project#395 fixed issues
* Polish apache/incubator-dubbo-spring-boot-project#395 Update documents
* Update the root POM's parent
* Replace ${project.version} to ${revision} in the "pom.xml" files
* Update <projectId>
* Remove Netty Project
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427
* 1.0.0 (#431)
* Polish apache/incubator-dubbo-spring-boot-project#395
* Polish apache/incubator-dubbo-spring-boot-project#395 fixed issues
* Polish apache/incubator-dubbo-spring-boot-project#395 Update documents
* Update the root POM's parent
* Replace ${project.version} to ${revision} in the "pom.xml" files
* Update <projectId>
* Remove Netty Project
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427 : Update Documents
* 2.7.0 (#433)
* Polish apache/incubator-dubbo-spring-boot-project#395
* Polish apache/incubator-dubbo-spring-boot-project#395 fixed issues
* Polish apache/incubator-dubbo-spring-boot-project#395 Update documents
* Update the root POM's parent
* Replace ${project.version} to ${revision} in the "pom.xml" files
* Update <projectId>
* Remove Netty Project
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427 : Update Documents
* Polish : apache/incubator-dubbo-spring-boot-project#427 : Fixed include pattern
* 1.0.0 (#435)
* Polish apache/incubator-dubbo-spring-boot-project#395
* Polish apache/incubator-dubbo-spring-boot-project#395 fixed issues
* Polish apache/incubator-dubbo-spring-boot-project#395 Update documents
* Update the root POM's parent
* Replace ${project.version} to ${revision} in the "pom.xml" files
* Update <projectId>
* Remove Netty Project
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427
* Polish : apache/incubator-dubbo-spring-boot-project#427 : Update Documents
* Polish : apache/incubator-dubbo-spring-boot-project#427 : Fixed include pattern
* Polish : apache/incubator-dubbo-spring-boot-project#427 : Correct words
* Update README.md (#445)
* Fix typo (#446)
* Move png files to subfolder (#448)
* Enable flatten plugin by default (#441) (#443)
* Polish apache/incubator-dubbo-spring-boot-project#449
* Polish apache/incubator-dubbo-spring-boot-project#467 : Set "spring.main.allow-bean-definition-overriding" property to be true as default
* Polish apache/incubator-dubbo-spring-boot-project#468 : Upgrade Dubbo 2.7.1
* Polish apache/incubator-dubbo-spring-boot-project#437 : Remove -XX:PermSize=64m -XX:MaxPermSize=128m
* Fix the issues of test cases
* Update Samples
* Update default version using Dubbo's version
* Polish apache/incubator-dubbo-spring-boot-project#456 : Update the Zookeeper dependencies
* Polish apache/incubator-dubbo-spring-boot-project#458 : dubbo.metadata-report.address propertie description not provided
* Polish apache/incubator-dubbo-spring-boot-project#458 : dubbo.metadata-report.address propertie description not provided
* Update 2.7.1
* Polish apache/incubator-dubbo-spring-boot-project#458 : Add "override" property
* Polish apache/incubator-dubbo-spring-boot-project#451 : Duplicate application configs
* Bugfix
* Update SNAPSHOT
* Update 2.7.1
* 2.7.x (#478)
* Fix apache/incubator-dubbo-spring-boot-project#169
* 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
…
---
README.md | 6 +-
README_CN.md | 4 +-
.../autoconfigure/BinderDubboConfigBinder.java | 29 +++---
.../DubboRelaxedBinding2AutoConfiguration.java | 11 +--
.../autoconfigure/BinderDubboConfigBinderTest.java | 22 ++++-
.../DubboRelaxedBinding2AutoConfigurationTest.java | 7 +-
.../DubboRelaxedBindingAutoConfiguration.java | 7 +-
.../autoconfigure/RelaxedDubboConfigBinder.java | 18 ++--
.../factory/config/DubboConfigBeanCustomizer.java | 12 ++-
...DubboConfigBeanDefinitionConflictProcessor.java | 5 +
...verrideBeanDefinitionRegistryPostProcessor.java | 2 +-
.../DubboApplicationContextInitializer.java | 5 +-
...BeanDefinitionConflictApplicationListener.java} | 57 +++++------
.../src/main/resources/META-INF/spring.factories | 1 +
.../CompatibleDubboAutoConfigurationTest.java | 4 +-
.../RelaxedDubboConfigBinderTest.java | 22 ++++-
...nDefinitionConflictApplicationListenerTest.java | 109 +++++++++++++++++++++
dubbo-spring-boot-compatible/pom.xml | 2 +-
dubbo-spring-boot-parent/pom.xml | 10 +-
dubbo-spring-boot-samples/pom.xml | 16 ---
pom.xml | 11 ++-
21 files changed, 251 insertions(+), 109 deletions(-)
diff --git a/README.md b/README.md
index 839c4ab..3a05148 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@
You can introduce the latest `dubbo-spring-boot-starter` to your project by adding the following dependency to your pom.xml
```xml
<properties>
- <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
- <dubbo.version>2.7.4.1</dubbo.version>
+ <spring-boot.version>2.2.2.RELEASE</spring-boot.version>
+ <dubbo.version>2.7.5</dubbo.version>
</properties>
<dependencyManagement>
@@ -204,7 +204,7 @@ public interface DemoService {
name: dubbo-auto-configure-consumer-sample
```
-If `DubboProviderDemo` doesn't work well, please make sure `DubboProviderDemo` is started.
+If `DubboProviderDemo` works well, please mark sure `DubboProviderDemo` is started.
More details, please refer to [Samples](dubbo-spring-boot-samples).
diff --git a/README_CN.md b/README_CN.md
index 53bdbab..96478c3 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -21,8 +21,8 @@
您可以为您的工程引入最新 `dubbo-spring-boot-starter` 的发布，增加以下依赖到工程的 `pom.xml` 文件中：
```xml
<properties>
- <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
- <dubbo.version>2.7.3</dubbo.version>
+ <spring-boot.version>2.2.2.RELEASE</spring-boot.version>
+ <dubbo.version>2.7.5</dubbo.version>
</properties>
<dependencyManagement>
diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/BinderDubboConfigBinder.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/BinderDubboConfigBinder.java
index b5d8962..3da5f0b 100644
--- a/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/BinderDubboConfigBinder.java
+++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/BinderDubboConfigBinder.java
@@ -16,9 +16,9 @@
*/
package org.apache.dubbo.spring.boot.autoconfigure;
-import org.apache.dubbo.config.AbstractConfig;
-import org.apache.dubbo.config.spring.context.properties.AbstractDubboConfigBinder;
import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
+
+import com.alibaba.spring.context.config.ConfigurationBeanBinder;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Bindable;
import org.springframework.boot.context.properties.bind.Binder;
@@ -27,8 +27,12 @@ import org.springframework.boot.context.properties.bind.handler.IgnoreErrorsBind
import org.springframework.boot.context.properties.bind.handler.NoUnboundElementsBindHandler;
import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
import org.springframework.boot.context.properties.source.UnboundElementsSourceFilter;
+import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
+import java.util.Map;
+
+import static java.util.Arrays.asList;
import static org.springframework.boot.context.properties.source.ConfigurationPropertySources.from;
/**
@@ -37,35 +41,36 @@ import static org.springframework.boot.context.properties.source.ConfigurationPr
*
* @since 2.7.0
*/
-class BinderDubboConfigBinder extends AbstractDubboConfigBinder {
+class BinderDubboConfigBinder implements ConfigurationBeanBinder {
@Override
- public <C extends AbstractConfig> void bind(String prefix, C dubboConfig) {
+ public void bind(Map<String, Object> configurationProperties, boolean ignoreUnknownFields,
+ boolean ignoreInvalidFields, Object configurationBean) {
- Iterable<PropertySource<?>> propertySources = getPropertySources();
+ Iterable<PropertySource<?>> propertySources = asList(new MapPropertySource("internal", configurationProperties));
// Converts ConfigurationPropertySources
Iterable<ConfigurationPropertySource> configurationPropertySources = from(propertySources);
// Wrap Bindable from DubboConfig instance
- Bindable<C> bindable = Bindable.ofInstance(dubboConfig);
+ Bindable bindable = Bindable.ofInstance(configurationBean);
Binder binder = new Binder(configurationPropertySources, new PropertySourcesPlaceholdersResolver(propertySources));
// Get BindHandler
- BindHandler bindHandler = getBindHandler();
+ BindHandler bindHandler = getBindHandler(ignoreUnknownFields, ignoreInvalidFields);
// Bind
- binder.bind(prefix, bindable, bindHandler);
-
+ binder.bind("", bindable, bindHandler);
}
- private BindHandler getBindHandler() {
+ private BindHandler getBindHandler(boolean ignoreUnknownFields,
+ boolean ignoreInvalidFields) {
BindHandler handler = BindHandler.DEFAULT;
- if (isIgnoreInvalidFields()) {
+ if (ignoreInvalidFields) {
handler = new IgnoreErrorsBindHandler(handler);
}
- if (!isIgnoreUnknownFields()) {
+ if (!ignoreUnknownFields) {
UnboundElementsSourceFilter filter = new UnboundElementsSourceFilter();
handler = new NoUnboundElementsBindHandler(handler, filter);
}
diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
index bb69733..9c10278 100644
--- a/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
+++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
@@ -16,8 +16,7 @@
*/
package org.apache.dubbo.spring.boot.autoconfigure;
-import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
-
+import com.alibaba.spring.context.config.ConfigurationBeanBinder;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -34,7 +33,7 @@ import org.springframework.core.env.PropertyResolver;
import java.util.Map;
-import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getPrefixedProperties;
+import static com.alibaba.spring.util.PropertySourcesUtils.getSubProperties;
import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME;
import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_PREFIX;
import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SCAN_PREFIX;
@@ -58,7 +57,7 @@ public class DubboRelaxedBinding2AutoConfiguration {
ConfigurableEnvironment propertyResolver = new AbstractEnvironment() {
@Override
protected void customizePropertySources(MutablePropertySources propertySources) {
- Map<String, Object> dubboScanProperties = getPrefixedProperties(environment.getPropertySources(), DUBBO_SCAN_PREFIX);
+ Map<String, Object> dubboScanProperties = getSubProperties(environment.getPropertySources(), DUBBO_SCAN_PREFIX);
propertySources.addLast(new MapPropertySource("dubboScanProperties", dubboScanProperties));
}
};
@@ -66,10 +65,10 @@ public class DubboRelaxedBinding2AutoConfiguration {
return new DelegatingPropertyResolver(propertyResolver);
}
- @ConditionalOnMissingBean(name = RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME, value = DubboConfigBinder.class)
+ @ConditionalOnMissingBean(name = RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME, value = ConfigurationBeanBinder.class)
@Bean(RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME)
@Scope(scopeName = SCOPE_PROTOTYPE)
- public DubboConfigBinder relaxedDubboConfigBinder() {
+ public ConfigurationBeanBinder relaxedDubboConfigBinder() {
return new BinderDubboConfigBinder();
}
diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/BinderDubboConfigBinderTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/BinderDubboConfigBinderTest.java
index 8005302..b992610 100644
--- a/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/BinderDubboConfigBinderTest.java
+++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/BinderDubboConfigBinderTest.java
@@ -19,14 +19,21 @@ package org.apache.dubbo.spring.boot.autoconfigure;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
+
+import com.alibaba.spring.context.config.ConfigurationBeanBinder;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
+import java.util.Map;
+
+import static com.alibaba.spring.util.PropertySourcesUtils.getSubProperties;
+
/**
* {@link BinderDubboConfigBinder} Test
*
@@ -38,23 +45,28 @@ import org.springframework.test.context.junit4.SpringRunner;
public class BinderDubboConfigBinderTest {
@Autowired
- private BinderDubboConfigBinder dubboConfigBinder;
+ private ConfigurationBeanBinder dubboConfigBinder;
+
+ @Autowired
+ private ConfigurableEnvironment environment;
@Test
public void testBinder() {
ApplicationConfig applicationConfig = new ApplicationConfig();
- dubboConfigBinder.bind("dubbo.application", applicationConfig);
+ Map<String, Object> properties = getSubProperties(environment.getPropertySources(), "dubbo.application");
+ dubboConfigBinder.bind(properties, true, true, applicationConfig);
Assert.assertEquals("hello", applicationConfig.getName());
Assert.assertEquals("world", applicationConfig.getOwner());
RegistryConfig registryConfig = new RegistryConfig();
- dubboConfigBinder.bind("dubbo.registry", registryConfig);
+ properties = getSubProperties(environment.getPropertySources(), "dubbo.registry");
+ dubboConfigBinder.bind(properties, true, true, registryConfig);
Assert.assertEquals("10.20.153.17", registryConfig.getAddress());
ProtocolConfig protocolConfig = new ProtocolConfig();
- dubboConfigBinder.bind("dubbo.protocol", protocolConfig);
+ properties = getSubProperties(environment.getPropertySources(), "dubbo.protocol");
+ dubboConfigBinder.bind(properties, true, true, protocolConfig);
Assert.assertEquals(Integer.valueOf(20881), protocolConfig.getPort());
-
}
}
diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java
index 78bf1cd..9787666 100644
--- a/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java
+++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java
@@ -18,8 +18,8 @@ package org.apache.dubbo.spring.boot.autoconfigure;
import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor;
-import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
+import com.alibaba.spring.context.config.ConfigurationBeanBinder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.ObjectProvider;
@@ -27,13 +27,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertyResolver;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.ClassUtils;
import java.util.Map;
-import java.util.Collection;
import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME;
import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME;
@@ -49,6 +49,7 @@ import static org.junit.Assert.assertTrue;
"dubbo.scan.basePackages = org.apache.dubbo.spring.boot.autoconfigure"
})
@EnableAutoConfiguration
+@PropertySource(value = "classpath:/dubbo.properties")
public class DubboRelaxedBinding2AutoConfigurationTest {
@Autowired
@@ -57,7 +58,7 @@ public class DubboRelaxedBinding2AutoConfigurationTest {
@Autowired
@Qualifier(RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME)
- private DubboConfigBinder dubboConfigBinder;
+ private ConfigurationBeanBinder dubboConfigBinder;
@Autowired
private ObjectProvider<ServiceAnnotationBeanPostProcessor> serviceAnnotationBeanPostProcessor;
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java
index eeaff6d..0536783 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java
@@ -16,8 +16,7 @@
*/
package org.apache.dubbo.spring.boot.autoconfigure;
-import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
-
+import com.alibaba.spring.context.config.ConfigurationBeanBinder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -47,10 +46,10 @@ public class DubboRelaxedBindingAutoConfiguration {
return new RelaxedPropertyResolver(environment, DUBBO_SCAN_PREFIX);
}
- @ConditionalOnMissingBean(name = RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME, value = DubboConfigBinder.class)
+ @ConditionalOnMissingBean(name = RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME, value = ConfigurationBeanBinder.class)
@Bean(RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME)
@Scope(scopeName = SCOPE_PROTOTYPE)
- public DubboConfigBinder relaxedDubboConfigBinder() {
+ public ConfigurationBeanBinder relaxedDubboConfigBinder() {
return new RelaxedDubboConfigBinder();
}
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinder.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinder.java
index 6089d63..40bc227 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinder.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinder.java
@@ -16,34 +16,32 @@
*/
package org.apache.dubbo.spring.boot.autoconfigure;
-import org.apache.dubbo.config.AbstractConfig;
-import org.apache.dubbo.config.spring.context.properties.AbstractDubboConfigBinder;
import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
+import com.alibaba.spring.context.config.ConfigurationBeanBinder;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.boot.bind.RelaxedDataBinder;
import java.util.Map;
-import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getPrefixedProperties;
/**
* Spring Boot Relaxed {@link DubboConfigBinder} implementation
*
* @since 2.7.0
*/
-class RelaxedDubboConfigBinder extends AbstractDubboConfigBinder {
+class RelaxedDubboConfigBinder implements ConfigurationBeanBinder {
@Override
- public <C extends AbstractConfig> void bind(String prefix, C dubboConfig) {
- RelaxedDataBinder relaxedDataBinder = new RelaxedDataBinder(dubboConfig);
+ public void bind(Map<String, Object> configurationProperties, boolean ignoreUnknownFields,
+ boolean ignoreInvalidFields, Object configurationBean) {
+ RelaxedDataBinder relaxedDataBinder = new RelaxedDataBinder(configurationBean);
// Set ignored*
- relaxedDataBinder.setIgnoreInvalidFields(isIgnoreInvalidFields());
- relaxedDataBinder.setIgnoreUnknownFields(isIgnoreUnknownFields());
+ relaxedDataBinder.setIgnoreInvalidFields(ignoreInvalidFields);
+ relaxedDataBinder.setIgnoreUnknownFields(ignoreUnknownFields);
// Get properties under specified prefix from PropertySources
- Map<String, Object> properties = getPrefixedProperties(getPropertySources(), prefix);
// Convert Map to MutablePropertyValues
- MutablePropertyValues propertyValues = new MutablePropertyValues(properties);
+ MutablePropertyValues propertyValues = new MutablePropertyValues(configurationProperties);
// Bind
relaxedDataBinder.bind(propertyValues);
}
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanCustomizer.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanCustomizer.java
index 518aed8..96be9fd 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanCustomizer.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanCustomizer.java
@@ -50,11 +50,13 @@ class DubboConfigBeanCustomizer extends NamePropertyDefaultValueDubboConfigBeanC
// AbstractConfig.checkName(String,String)
Method method = findMethod(AbstractConfig.class, "checkName", String.class, String.class);
try {
- if (!method.isAccessible()) {
- method.setAccessible(true);
- }
- if (BeanUtils.getPropertyDescriptor(dubboConfigBean.getClass(), propertyName) != null) {
- invokeMethod(method, null, propertyName, propertyValue);
+ if (method != null) {
+ if (!method.isAccessible()) {
+ method.setAccessible(true);
+ }
+ if (BeanUtils.getPropertyDescriptor(dubboConfigBean.getClass(), propertyName) != null) {
+ invokeMethod(method, null, propertyName, propertyValue);
+ }
}
} catch (IllegalStateException e) {
valid = false;
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanDefinitionConflictProcessor.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanDefinitionConflictProcessor.java
index 8076101..61697a6 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanDefinitionConflictProcessor.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanDefinitionConflictProcessor.java
@@ -18,6 +18,7 @@ package org.apache.dubbo.spring.boot.beans.factory.config;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
+import org.apache.dubbo.spring.boot.context.event.DubboConfigBeanDefinitionConflictApplicationListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +44,12 @@ import static org.springframework.context.ConfigurableApplicationContext.ENVIRON
*
* @see BeanDefinition
* @see BeanDefinitionRegistryPostProcessor
+ * @see DubboConfigBeanDefinitionConflictApplicationListener
* @since 2.7.1
+ * @deprecated Since 2.7.5, {@link DubboConfigBeanDefinitionConflictApplicationListener} will be a substituted
+ * implementation
*/
+@Deprecated
public class DubboConfigBeanDefinitionConflictProcessor implements BeanDefinitionRegistryPostProcessor, Ordered {
private final Logger logger = LoggerFactory.getLogger(getClass());
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/OverrideBeanDefinitionRegistryPostProcessor.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/OverrideBeanDefinitionRegistryPostProcessor.java
index 164f081..0c15f0e 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/OverrideBeanDefinitionRegistryPostProcessor.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/OverrideBeanDefinitionRegistryPostProcessor.java
@@ -21,8 +21,8 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
+import static com.alibaba.spring.util.BeanRegistrar.registerInfrastructureBean;
import static org.apache.dubbo.config.spring.context.config.NamePropertyDefaultValueDubboConfigBeanCustomizer.BEAN_NAME;
-import static org.apache.dubbo.config.spring.util.BeanRegistrar.registerInfrastructureBean;
/**
* Override {@link BeanDefinitionRegistryPostProcessor}
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/DubboApplicationContextInitializer.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/DubboApplicationContextInitializer.java
index 939f17b..e90dd8c 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/DubboApplicationContextInitializer.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/DubboApplicationContextInitializer.java
@@ -16,7 +16,6 @@
*/
package org.apache.dubbo.spring.boot.context;
-import org.apache.dubbo.spring.boot.beans.factory.config.DubboConfigBeanDefinitionConflictProcessor;
import org.apache.dubbo.spring.boot.beans.factory.config.OverrideBeanDefinitionRegistryPostProcessor;
import org.springframework.context.ApplicationContextInitializer;
@@ -38,7 +37,9 @@ public class DubboApplicationContextInitializer implements ApplicationContextIni
private void overrideBeanDefinitions(ConfigurableApplicationContext applicationContext) {
applicationContext.addBeanFactoryPostProcessor(new OverrideBeanDefinitionRegistryPostProcessor());
- applicationContext.addBeanFactoryPostProcessor(new DubboConfigBeanDefinitionConflictProcessor());
+ // @since 2.7.5 DubboConfigBeanDefinitionConflictProcessor has been removed
+ // @see {@link DubboConfigBeanDefinitionConflictApplicationListener}
+ // applicationContext.addBeanFactoryPostProcessor(new DubboConfigBeanDefinitionConflictProcessor());
}
@Override
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanDefinitionConflictProcessor.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/DubboConfigBeanDefinitionConflictApplicationListener.java
similarity index 63%
copy from dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanDefinitionConflictProcessor.java
copy to dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/DubboConfigBeanDefinitionConflictApplicationListener.java
index 8076101..ab85b50 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/DubboConfigBeanDefinitionConflictProcessor.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/DubboConfigBeanDefinitionConflictApplicationListener.java
@@ -14,19 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.spring.boot.beans.factory.config;
+package org.apache.dubbo.spring.boot.context.event;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.Ordered;
import org.springframework.core.env.Environment;
@@ -38,42 +41,38 @@ import static org.springframework.beans.factory.BeanFactoryUtils.beanNamesForTyp
import static org.springframework.context.ConfigurableApplicationContext.ENVIRONMENT_BEAN_NAME;
/**
- * Dubbo Config {@link BeanDefinition Bean Definition} {@link BeanDefinitionRegistryPostProcessor processor}
- * to resolve conflict
- *
+ * The {@link ApplicationListener} class for Dubbo Config {@link BeanDefinition Bean Definition} to resolve conflict
* @see BeanDefinition
- * @see BeanDefinitionRegistryPostProcessor
- * @since 2.7.1
+ * @see ApplicationListener
+ * @since 2.7.5
*/
-public class DubboConfigBeanDefinitionConflictProcessor implements BeanDefinitionRegistryPostProcessor, Ordered {
+public class DubboConfigBeanDefinitionConflictApplicationListener implements ApplicationListener<ContextRefreshedEvent>,
+ Ordered {
private final Logger logger = LoggerFactory.getLogger(getClass());
- private BeanDefinitionRegistry registry;
-
- private Environment environment;
-
@Override
- public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
- this.registry = registry;
+ public void onApplicationEvent(ContextRefreshedEvent event) {
+ ApplicationContext applicationContext = event.getApplicationContext();
+ BeanDefinitionRegistry registry = getBeanDefinitionRegistry(applicationContext);
+ resolveUniqueApplicationConfigBean(registry, applicationContext);
}
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
- resolveUniqueApplicationConfigBean(registry, beanFactory);
+ private BeanDefinitionRegistry getBeanDefinitionRegistry(ApplicationContext applicationContext) {
+ AutowireCapableBeanFactory beanFactory = applicationContext.getAutowireCapableBeanFactory();
+ if (beanFactory instanceof BeanDefinitionRegistry) {
+ return (BeanDefinitionRegistry) beanFactory;
+ }
+ throw new IllegalStateException("");
}
/**
* Resolve the unique {@link ApplicationConfig} Bean
- *
- * @param registry {@link BeanDefinitionRegistry} instance
+ * @param registry {@link BeanDefinitionRegistry} instance
* @param beanFactory {@link ConfigurableListableBeanFactory} instance
* @see EnableDubboConfig
*/
- private void resolveUniqueApplicationConfigBean(BeanDefinitionRegistry registry,
- ConfigurableListableBeanFactory beanFactory) {
-
- this.environment = beanFactory.getBean(ENVIRONMENT_BEAN_NAME, Environment.class);
+ private void resolveUniqueApplicationConfigBean(BeanDefinitionRegistry registry, ListableBeanFactory beanFactory) {
String[] beansNames = beanNamesForTypeIncludingAncestors(beanFactory, ApplicationConfig.class);
@@ -81,9 +80,11 @@ public class DubboConfigBeanDefinitionConflictProcessor implements BeanDefinitio
return;
}
+ Environment environment = beanFactory.getBean(ENVIRONMENT_BEAN_NAME, Environment.class);
+
// Remove ApplicationConfig Beans that are configured by "dubbo.application.*"
Stream.of(beansNames)
- .filter(this::isConfiguredApplicationConfigBeanName)
+ .filter(beansName -> isConfiguredApplicationConfigBeanName(environment, beansName))
.forEach(registry::removeBeanDefinition);
beansNames = beanNamesForTypeIncludingAncestors(beanFactory, ApplicationConfig.class);
@@ -98,14 +99,14 @@ public class DubboConfigBeanDefinitionConflictProcessor implements BeanDefinitio
}
}
- private boolean isConfiguredApplicationConfigBeanName(String beanName) {
+ private boolean isConfiguredApplicationConfigBeanName(Environment environment, String beanName) {
boolean removed = BeanFactoryUtils.isGeneratedBeanName(beanName)
// Dubbo ApplicationConfig id as bean name
|| Objects.equals(beanName, environment.getProperty("dubbo.application.id"));
if (removed) {
- if (logger.isWarnEnabled()) {
- logger.warn("The {} bean [ name : {} ] has been removed!", ApplicationConfig.class.getSimpleName(), beanName);
+ if (logger.isDebugEnabled()) {
+ logger.debug("The {} bean [ name : {} ] has been removed!", ApplicationConfig.class.getSimpleName(), beanName);
}
}
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/resources/META-INF/spring.factories b/dubbo-spring-boot-compatible/autoconfigure/src/main/resources/META-INF/spring.factories
index e3005db..c4c28ea 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/main/resources/META-INF/spring.factories
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/resources/META-INF/spring.factories
@@ -3,6 +3,7 @@ org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfiguration,\
org.apache.dubbo.spring.boot.autoconfigure.DubboRelaxedBindingAutoConfiguration
org.springframework.context.ApplicationListener=\
org.apache.dubbo.spring.boot.context.event.OverrideDubboConfigApplicationListener,\
+org.apache.dubbo.spring.boot.context.event.DubboConfigBeanDefinitionConflictApplicationListener,\
org.apache.dubbo.spring.boot.context.event.WelcomeLogoApplicationListener,\
org.apache.dubbo.spring.boot.context.event.AwaitingNonWebApplicationListener
org.springframework.boot.env.EnvironmentPostProcessor=\
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/CompatibleDubboAutoConfigurationTest.java b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/CompatibleDubboAutoConfigurationTest.java
index cd574e0..b0d8681 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/CompatibleDubboAutoConfigurationTest.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/CompatibleDubboAutoConfigurationTest.java
@@ -18,6 +18,7 @@ package org.apache.dubbo.spring.boot.autoconfigure;
import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,11 +26,11 @@ import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.PropertySource;
import org.springframework.test.context.junit4.SpringRunner;
/**
* {@link DubboAutoConfiguration} Test
- *
* @see DubboAutoConfiguration
*/
@RunWith(SpringRunner.class)
@@ -39,6 +40,7 @@ import org.springframework.test.context.junit4.SpringRunner;
"dubbo.scan.base-packages = org.apache.dubbo.spring.boot.autoconfigure"
})
@EnableAutoConfiguration
+@PropertySource(value = "classpath:/META-INF/dubbo.properties")
public class CompatibleDubboAutoConfigurationTest {
@Autowired
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinderTest.java b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinderTest.java
index 817f035..40f596e 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinderTest.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinderTest.java
@@ -19,15 +19,21 @@ package org.apache.dubbo.spring.boot.autoconfigure;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
+
+import com.alibaba.spring.context.config.ConfigurationBeanBinder;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
+import java.util.Map;
+
+import static com.alibaba.spring.util.PropertySourcesUtils.getSubProperties;
+
/**
* {@link RelaxedDubboConfigBinder} Test
*/
@@ -43,22 +49,28 @@ import org.springframework.test.context.junit4.SpringRunner;
public class RelaxedDubboConfigBinderTest {
@Autowired
- private DubboConfigBinder dubboConfigBinder;
+ private ConfigurationBeanBinder dubboConfigBinder;
+
+ @Autowired
+ private ConfigurableEnvironment environment;
@Test
public void testBinder() {
ApplicationConfig applicationConfig = new ApplicationConfig();
- dubboConfigBinder.bind("dubbo.application", applicationConfig);
+ Map<String, Object> properties = getSubProperties(environment.getPropertySources(), "dubbo.application");
+ dubboConfigBinder.bind(properties, true, true, applicationConfig);
Assert.assertEquals("hello", applicationConfig.getName());
Assert.assertEquals("world", applicationConfig.getOwner());
RegistryConfig registryConfig = new RegistryConfig();
- dubboConfigBinder.bind("dubbo.registry", registryConfig);
+ properties = getSubProperties(environment.getPropertySources(), "dubbo.registry");
+ dubboConfigBinder.bind(properties, true, true, registryConfig);
Assert.assertEquals("10.20.153.17", registryConfig.getAddress());
ProtocolConfig protocolConfig = new ProtocolConfig();
- dubboConfigBinder.bind("dubbo.protocol", protocolConfig);
+ properties = getSubProperties(environment.getPropertySources(), "dubbo.protocol");
+ dubboConfigBinder.bind(properties, true, true, protocolConfig);
Assert.assertEquals(Integer.valueOf(20881), protocolConfig.getPort());
}
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/DubboConfigBeanDefinitionConflictApplicationListenerTest.java b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/DubboConfigBeanDefinitionConflictApplicationListenerTest.java
new file mode 100644
index 0000000..ce87523
--- /dev/null
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/DubboConfigBeanDefinitionConflictApplicationListenerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.spring.boot.context.event;
+
+import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
+import org.apache.dubbo.spring.boot.beans.factory.config.DubboConfigBeanDefinitionConflictProcessor;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.Ordered;
+
+import java.util.Map;
+
+
+/**
+ * {@link DubboConfigBeanDefinitionConflictApplicationListener} Test
+ * @since 2.7.5
+ */
+public class DubboConfigBeanDefinitionConflictApplicationListenerTest {
+
+ private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+
+ @Before
+ public void init() {
+ context.addApplicationListener(new DubboConfigBeanDefinitionConflictApplicationListener());
+ }
+
+ @After
+ public void destroy() {
+ context.close();
+ }
+
+ @Test
+ public void testOrder() {
+ Assert.assertEquals(Ordered.LOWEST_PRECEDENCE, new DubboConfigBeanDefinitionConflictProcessor().getOrder());
+ }
+
+ @Test
+ public void testNormalCase() {
+
+ System.setProperty("dubbo.application.name", "test-dubbo-application");
+
+ context.register(DubboConfig.class);
+
+ context.refresh();
+
+ ApplicationConfig applicationConfig = context.getBean(ApplicationConfig.class);
+
+ Assert.assertEquals("test-dubbo-application", applicationConfig.getName());
+ }
+
+ @Test
+ public void testDuplicatedConfigsCase() {
+
+ context.register(PropertySourceConfig.class, DubboConfig.class);
+
+ context.register(XmlConfig.class);
+
+ context.refresh();
+
+ Map<String, ApplicationConfig> beansMap = context.getBeansOfType(ApplicationConfig.class);
+
+ ApplicationConfig applicationConfig = beansMap.get("dubbo-consumer-2.7.x");
+
+ Assert.assertEquals(1, beansMap.size());
+
+ Assert.assertEquals("dubbo-consumer-2.7.x", applicationConfig.getName());
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testFailedCase() {
+ context.register(ApplicationConfig.class);
+ testDuplicatedConfigsCase();
+ }
+
+ @EnableDubboConfig
+ static class DubboConfig {
+
+ }
+
+ @PropertySource("classpath:/META-INF/dubbo.properties")
+ static class PropertySourceConfig {
+
+ }
+
+ @ImportResource("classpath:/META-INF/spring/dubbo-context.xml")
+ static class XmlConfig {
+ }
+}
diff --git a/dubbo-spring-boot-compatible/pom.xml b/dubbo-spring-boot-compatible/pom.xml
index fb8c14e..cdbbf93 100644
--- a/dubbo-spring-boot-compatible/pom.xml
+++ b/dubbo-spring-boot-compatible/pom.xml
@@ -32,7 +32,7 @@
<description>Apache Dubbo Spring Boot Compatible for Spring Boot 1.x</description>
<properties>
- <spring-boot.version>1.5.21.RELEASE</spring-boot.version>
+ <spring-boot.version>1.5.22.RELEASE</spring-boot.version>
</properties>
<modules>
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index 38adc97..1eed259 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -38,7 +38,7 @@
<java.target.version>1.8</java.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
+ <spring-boot.version>2.2.2.RELEASE</spring-boot.version>
<dubbo.version>${revision}</dubbo.version>
<!-- Build args -->
<argline>-server -Xms256m -Xmx512m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true
@@ -439,6 +439,14 @@
</properties>
</profile>
+ <profile>
+ <!-- Spring Boot 2.1 -->
+ <id>spring-boot-2.1</id>
+ <properties>
+ <spring-boot.version>2.1.11.RELEASE</spring-boot.version>
+ </properties>
+ </profile>
+
</profiles>
</project>
diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml
index e3adab3..7e79622 100644
--- a/dubbo-spring-boot-samples/pom.xml
+++ b/dubbo-spring-boot-samples/pom.xml
@@ -78,21 +78,5 @@
</properties>
</profile>
- <profile>
- <!-- Spring Boot 2.0 -->
- <id>spring-boot-2.0</id>
- <properties>
- <spring-boot.version>2.0.9.RELEASE</spring-boot.version>
- </properties>
- </profile>
-
- <profile>
- <!-- Spring Boot 2.1 -->
- <id>spring-boot-2.1</id>
- <properties>
- <spring-boot.version>2.1.9.RELEASE</spring-boot.version>
- </properties>
- </profile>
-
</profiles>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a6b05d1..c69beb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<properties>
<maven_javadoc_version>3.0.1</maven_javadoc_version>
<maven_surefire_version>2.19.1</maven_surefire_version>
- <revision>2.7.4.1</revision>
+ <revision>2.7.5</revision>
</properties>
<modules>
@@ -90,8 +90,8 @@
</mailingLists>
<developers>
<developer>
- <id>Apache Dubbo </id>
- <name>The Apache Dubbo Project Contributors</name>
+ <id>Apache Dubbo</id>
+ <name>The Apache Dubbo Project Contributors</name>
<email>dev@dubbo.apache.org</email>
<url>http://dubbo.apache.org</url>
</developer>
@@ -105,6 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -118,6 +119,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<phase>verify</phase>
@@ -127,7 +129,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
@@ -188,6 +190,7 @@
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>