[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #133 from ralf0131/java10-ut
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 79a6cdf486849896b1d2cd0e031e96020bd284ba Merge: 2993cbd 84e80dc Author: 小马哥 <mercybl...@gmail.com> AuthorDate: Tue May 15 10:34:44 2018 +0800 Merge pull request #133 from ralf0131/java10-ut Ensure UT pass on Java 10. #128 dubbo-spring-boot-parent/pom.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/02: Update Chinese document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 9afb1218d8753fff2ccca9eb753396c49660faf5 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Thu Mar 29 21:02:00 2018 +0800 Update Chinese document --- README_CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index e14b00c..b403b5a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -54,7 +54,7 @@ ### 开发版本 -如果你需要尝试最新 `dubbo-spring-boot-project` 的特性,您可以自将[开发分支](tree/0.1.x) 手动 Maven install 到本地 Maven 仓库。 +如果你需要尝试最新 `dubbo-spring-boot-project` 的特性,您可将当前工程手动 Maven install 到本地 Maven 仓库。 -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 02/02: Update Dubbo 2.6.2-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 29f22423dc1e4a8b019f251792ea69b9a6fe10ac Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 21:49:31 2018 +0800 Update Dubbo 2.6.2-SNAPSHOT --- dubbo-spring-boot-parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 871c3af..253a151 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -20,8 +20,8 @@ 1.8 UTF-8 UTF-8 -2.0.0.RELEASE -2.5.11 +2.0.1.RELEASE +2.6.2-SNAPSHOT 0.2 3.4.9 2.12.0 -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (ca9454f -> 29f2242)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from ca9454f Update Chinese document new 9afb121 Update Chinese document new 29f2242 Update Dubbo 2.6.2-SNAPSHOT The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README_CN.md | 2 +- dubbo-spring-boot-parent/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Fixed test case issues
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new d159e11 Fixed test case issues d159e11 is described below commit d159e116c9d7a31e7c8ca5159f2c0f06d7d95196 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 22:11:29 2018 +0800 Fixed test case issues --- .../DubboEndpointsAutoConfigurationTest.java | 24 +++--- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java index ad1cd0f..9bd190b 100644 --- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java @@ -143,7 +143,7 @@ public class DubboEndpointsAutoConfigurationTest { Assert.assertEquals(1, services.size()); -Map<String, Object> demoServiceMeta = services.get("serviceb...@com.alibaba.boot.dubbo.actuate.endpoint.DubboEndpointsAutoConfigurationTest$DemoService#dubboEndpointsAutoConfigurationTest.DefaultDemoService"); +Map<String, Object> demoServiceMeta = services.get("ServiceBean:dubboEndpointsAutoConfigurationTest.DefaultDemoService:com.alibaba.boot.dubbo.actuate.endpoint.DubboEndpointsAutoConfigurationTest$DemoService:${dubbo.service.version}"); Assert.assertEquals("1.0.0", demoServiceMeta.get("version")); @@ -178,20 +178,20 @@ public class DubboEndpointsAutoConfigurationTest { } -@Service( -version = "${dubbo.service.version}", -application = "${dubbo.application.id}", -protocol = "${dubbo.protocol.id}", -registry = "${dubbo.registry.id}" -) -static class DefaultDemoService implements DemoService { - -public String sayHello(String name) { -return "Hello, " + name + " (from Spring Boot)"; -} +@Service( +version = "${dubbo.service.version}", +application = "${dubbo.application.id}", +protocol = "${dubbo.protocol.id}", +registry = "${dubbo.registry.id}" +) +static class DefaultDemoService implements DemoService { +public String sayHello(String name) { +return "Hello, " + name + " (from Spring Boot)"; } +} + interface DemoService { String sayHello(String name); } -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (d948398 -> 45accb4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from d948398 Update Document add 45accb4 Update Document No new revisions were added by this update. Summary of changes: README.md| 6 +++--- README_CN.md | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (45accb4 -> 5d52ba0)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 45accb4 Update Document add de5527c [DUBBO-9]add apache-rat-plugin to check asf license header add 55381b5 extract apache-rat-plugin jar version add 306d270 1) Fix issue#64, remove redundant blank spaces; 2) Add the lost comma after 'e.g.'. add 584a8d6 Merge pull request #65 from dongxuwang/master add bb99127 update readme add 59a6144 Merge pull request #97 from nzomkxia/master add 0cea013 fix issues #102 add 24ce1ae Merge pull request #103 from fuyongde/master add af6d29c Fix issue #113 . add e4db44c Fix typo add 2a34ad1 merge master add 84d5fcf update pom.xml add 65e0d5e Merge pull request #118 from lovepoem/add_apache_rat_plugin_to_check_asf_license_header add 1c33791 fix comment add 51a200e Merge pull request #122 from hengyunabc/master add 1ceb5e1 Update info after joining Apache Incubator. new 5d52ba0 Merge branch 'master' into 0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 51 ++-- dubbo-spring-boot-actuator/pom.xml | 17 ++- .../boot/dubbo/actuate/endpoint/DubboEndpoint.java | 2 +- .../dubbo/actuate/endpoint/DubboEndpointTest.java | 10 ++-- dubbo-spring-boot-autoconfigure/README.md | 2 +- dubbo-spring-boot-autoconfigure/pom.xml| 17 ++- .../event/WelcomeLogoApplicationListener.java | 2 +- .../com/alibaba/boot/dubbo/util/DubboUtils.java| 10 ++-- .../alibaba/boot/dubbo/util/DubboUtilsTest.java| 10 ++-- dubbo-spring-boot-parent/pom.xml | 56 +- .../dubbo-spring-boot-sample-api/pom.xml | 17 ++- .../dubbo-spring-boot-sample-consumer/pom.xml | 17 ++- .../dubbo-spring-boot-sample-provider/pom.xml | 17 ++- .../src/main/resources/application.properties | 2 +- dubbo-spring-boot-samples/pom.xml | 17 ++- dubbo-spring-boot-starter/pom.xml | 17 ++- pom.xml| 16 +++ 17 files changed, 226 insertions(+), 54 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (1ceb5e1 -> 67c5ac4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 1ceb5e1 Update info after joining Apache Incubator. add fb1ac37 Update the version and document add 42b5b48 Update Spring Boot dependencies to be 1.5.10.RELEASE add 47ba15d Remove @EnableConfigurationProperties Beans add d436a4b Polish #67 add f3b5bd4 Add branch 0.2.0 for Spring Boot 2.0.0 add 45813e4 Polish #78 #57 #37 add cb3b53c Update Document add 7652f4b Bug fix add 002743f Polish samples #67 add 5f9a8f5 Remove log4j add 95de333 Remove Web words add 52670e2 Update Chinese document add ca9454f Update Chinese document add 9afb121 Update Chinese document add 29f2242 Update Dubbo 2.6.2-SNAPSHOT add ec59798 Update version to be SNAPSHOT add 3a88085 Update Document add d159e11 Fixed test case issues add ea4e200 Update Document add d948398 Update Document add 45accb4 Update Document add 5d52ba0 Merge branch 'master' into 0.2.0 new 67c5ac4 Merge pull request #83 from apache/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 38 +- README_CN.md | 290 ++ dubbo-spring-boot-actuator/JMX_HealthEndpoint.png | Bin 284819 -> 230227 bytes dubbo-spring-boot-actuator/README.md | 125 ++- dubbo-spring-boot-actuator/pom.xml |2 +- .../DubboEndpointAutoConfiguration.java| 44 - .../DubboEndpointsAutoConfiguration.java | 83 ++ .../DubboHealthIndicatorAutoConfiguration.java |4 +- ...oMvcEndpointManagementContextConfiguration.java | 49 - .../actuate/endpoint/AbstractDubboEndpoint.java| 123 +++ .../endpoint/DubboConfigsMetadataEndpoint.java | 79 ++ .../boot/dubbo/actuate/endpoint/DubboEndpoint.java | 35 +- .../actuate/endpoint/DubboPropertiesEndpoint.java | 24 +- .../endpoint/DubboReferencesMetadataEndpoint.java | 73 ++ .../endpoint/DubboServicesMetadataEndpoint.java| 86 ++ .../actuate/endpoint/DubboShutdownEndpoint.java| 82 ++ .../actuate/endpoint/mvc/DubboMvcEndpoint.java | 459 .../META-INF/dubbo-endpoins-default.properties | 22 + .../src/main/resources/META-INF/spring.factories |7 +- .../dubbo/actuate/endpoint/DubboEndpointTest.java | 28 +- ...va => DubboEndpointsAutoConfigurationTest.java} | 110 +- .../actuate/health/DubboHealthIndicatorTest.java |6 +- dubbo-spring-boot-autoconfigure/README.md |2 +- dubbo-spring-boot-autoconfigure/pom.xml|2 +- .../autoconfigure/DubboAutoConfiguration.java | 24 +- .../dubbo/autoconfigure/DubboConfigProperties.java | 61 -- .../dubbo/autoconfigure/DubboScanProperties.java | 53 - .../MultipleDubboConfigBindingProperties.java | 140 --- .../autoconfigure/RelaxedDubboConfigBinder.java| 72 ++ .../SingleDubboConfigBindingProperties.java| 136 --- .../event/AwaitingNonWebApplicationListener.java | 97 ++ .../event/WelcomeLogoApplicationListener.java |2 +- .../META-INF/spring-configuration-metadata.json| 1098 .../src/main/resources/META-INF/spring.factories |3 +- ...DubboAutoConfigurationOnMultipleConfigTest.java | 75 +- .../DubboAutoConfigurationOnSingleConfigTest.java | 43 +- .../RelaxedDubboConfigBinderTest.java | 61 ++ ...eDubboConfigApplicationListenerDisableTest.java |6 +- ...OverrideDubboConfigApplicationListenerTest.java |6 +- .../event/WelcomeLogoApplicationListenerTest.java |6 +- .../src/test/resources/dubbo.properties|5 + dubbo-spring-boot-parent/pom.xml | 16 +- .../dubbo-spring-boot-sample-api/pom.xml |2 +- .../dubbo-spring-boot-sample-consumer/pom.xml | 10 +- .../controller/DemoConsumerController.java |2 +- .../src/main/resources/application.properties | 17 +- .../dubbo-spring-boot-sample-provider/pom.xml | 12 +- .../demo/provider/bootstrap/DubboProviderDemo.java |7 +- .../demo/provider/service/DefaultDemoService.java |2 +- .../src/main/resources/application.properties | 13 +- dubbo-spring-boot-samples/pom.xml |2 +- dubbo-spring-boot-starter/pom.xml |8 +- pom.xml|2 +- 53 files changed, 2458 insertions(+), 1296 deletions(-) create mode 100644 README_CN.md delete mode 100644 dubbo-spring-boot-actuator
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update Document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 3a88085 Update Document 3a88085 is described below commit 3a8808509e5925cbaf2f65722443d68a222eb756 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 21:55:06 2018 +0800 Update Document --- README.md | 6 +++--- README_CN.md | 8 dubbo-spring-boot-actuator/README.md | 6 +++--- dubbo-spring-boot-autoconfigure/README.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index bc8ecde..9cd25a2 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by add com.alibaba.boot dubbo-spring-boot-starter -0.2.0 +0.2.0-SNAPSHOT ``` If your project failed to resolve the dependency, try to add the following repository: @@ -52,8 +52,8 @@ If your project failed to resolve the dependency, try to add the following repos | versions | Java | Spring Boot | Dubbo | | | - | - | -- | -| `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | -| `0.1.1` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | +| `0.2.0-SNAPSHOT` | 1.8 + | `2.0.x` | `2.6.2` + | +| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.x` | `2.6.2` + | diff --git a/README_CN.md b/README_CN.md index b403b5a..892d225 100644 --- a/README_CN.md +++ b/README_CN.md @@ -36,14 +36,14 @@ com.alibaba.boot dubbo-spring-boot-starter -0.2.0 +0.2.0-SNAPSHOT com.alibaba.boot dubbo-spring-boot-actuator -0.2.0 +0.2.0-SNAPSHOT ... @@ -62,8 +62,8 @@ | 版本 | Java | Spring Boot | Dubbo | | | - | - | -- | -| `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | -| `0.1.1` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | +| `0.2.0-SNAPSHOT` | 1.8 + | `2.0.x` | `2.6.2` + | +| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.x` | `2.6.2` + | diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index e73c1f6..81d7b1a 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -33,7 +33,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad com.alibaba.boot dubbo-spring-boot-actuator -0.2.0 +0.2.0-SNAPSHOT ``` If your project failed to resolve the dependency, try to add the following repository: @@ -184,8 +184,8 @@ Actuator endpoint `dubbo` supports Actuator Endpoints : { "timestamp": 1516623290166, "versions": { -"dubbo-spring-boot": "0.2.0" -"dubbo": "2.5.11" +"dubbo-spring-boot": "0.2.0-SNAPSHOT" +"dubbo": "2.6.2" }, "urls": { "dubbo": "https://github.com/alibaba/dubbo;, diff --git a/dubbo-spring-boot-autoconfigure/README.md b/dubbo-spring-boot-autoconfigure/README.md index 9490e7d..15aacb9 100644 --- a/dubbo-spring-boot-autoconfigure/README.md +++ b/dubbo-spring-boot-autoconfigure/README.md @@ -23,7 +23,7 @@ You can introduce the latest `dubbo-spring-boot-autoconfigure` to your project com.alibaba.boot dubbo-spring-boot-autoconfigure -0.1.1 +0.1.1-SNAPSHOT ``` -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.1 deleted (was ec371a7)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. was ec371a7 Update Chinese document This change permanently discards the following revisions: discard ec371a7 Update Chinese document -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: 1. Update Dubbo 2.6.2-SNAPSHOT 2. Fixed issues from test cases
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 3df3c8e 1. Update Dubbo 2.6.2-SNAPSHOT 2. Fixed issues from test cases 3df3c8e is described below commit 3df3c8eb9b02fc8c50c813dba2200635062e0e5e Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 21:45:19 2018 +0800 1. Update Dubbo 2.6.2-SNAPSHOT 2. Fixed issues from test cases --- README.md | 6 +++--- README_CN.md | 6 +++--- dubbo-spring-boot-actuator/README.md | 2 +- dubbo-spring-boot-actuator/README_CN.md | 4 ++-- dubbo-spring-boot-actuator/pom.xml| 2 +- .../alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java| 8 .../boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java | 2 +- dubbo-spring-boot-autoconfigure/README.md | 2 +- dubbo-spring-boot-autoconfigure/pom.xml | 2 +- dubbo-spring-boot-parent/pom.xml | 4 ++-- dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml| 2 +- .../dubbo-spring-boot-sample-consumer/pom.xml | 2 +- .../dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 21 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 0ce3da2..6395455 100644 --- a/README.md +++ b/README.md @@ -34,14 +34,14 @@ You can introduce the latest `dubbo-spring-boot-project` to your project by add com.alibaba.boot dubbo-spring-boot-starter -0.1.1 +0.1.1-SNAPSHOT com.alibaba.boot dubbo-spring-boot-actuator -0.1.1 +0.1.1-SNAPSHOT ... @@ -72,7 +72,7 @@ If your project failed to resolve the dependency, try to add the following repos | versions | Java | Spring Boot | Dubbo | | | - | - | -- | | `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | -| `0.1.1` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | +| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | diff --git a/README_CN.md b/README_CN.md index 9533235..66ace58 100644 --- a/README_CN.md +++ b/README_CN.md @@ -36,14 +36,14 @@ com.alibaba.boot dubbo-spring-boot-starter -0.1.1 +0.1.1-SNAPSHOT com.alibaba.boot dubbo-spring-boot-actuator -0.1.1 +0.1.1-SNAPSHOT ... @@ -63,7 +63,7 @@ | 版本 | Java | Spring Boot | Dubbo | | | - | - | -- | | `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | -| `0.1.1` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | +| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 1a67d86..257d9f7 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -21,7 +21,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad com.alibaba.boot dubbo-spring-boot-actuator -0.1.1 +0.1.1-SNAPSHOT ``` If your project failed to resolve the dependency, try to add the following repository: diff --git a/dubbo-spring-boot-actuator/README_CN.md b/dubbo-spring-boot-actuator/README_CN.md index 2e64003..8273780 100644 --- a/dubbo-spring-boot-actuator/README_CN.md +++ b/dubbo-spring-boot-actuator/README_CN.md @@ -31,14 +31,14 @@ com.alibaba.boot dubbo-spring-boot-starter -0.1.1 +0.1.1-SNAPSHOT com.alibaba.boot dubbo-spring-boot-actuator -0.1.1 +0.1.1-SNAPSHOT ... diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index a73c7cf..4722459 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -5,7 +5,7 @@ dubbo-spring-boot-parent com.alibaba.boot -0.1.1 +0.1.1-SNAPSHOT ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java index a3161be..16eef99 100644 --- a/dubbo-sprin
[incubator-dubbo-spring-boot-project] 01/02: Update Document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit ea4e2008baf3f24dd8cff2d3c70517175a64a3b6 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 22:44:21 2018 +0800 Update Document --- README.md | 42 +- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 9cd25a2..71b099f 100644 --- a/README.md +++ b/README.md @@ -10,26 +10,18 @@ ## [中文文档](README_CN.md) -## Versions -For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot 2.x and 1.x once release : - -* `0.2.x` is a main stream release version for Spring Boot 2.x - -* [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) is a legacy version for maintaining Spring Boot 1.x +## Released version - - -## Integrate with Maven - -You can introduce the latest `dubbo-spring-boot-starter` to your project by adding the following dependency to your pom.xml +You can introduce the latest `dubbo-spring-boot-starter` to your project by adding the following dependency to your pom.xml ```xml com.alibaba.boot dubbo-spring-boot-starter -0.2.0-SNAPSHOT +0.1.0 ``` + If your project failed to resolve the dependency, try to add the following repository: ```xml @@ -47,13 +39,29 @@ If your project failed to resolve the dependency, try to add the following repos ``` +## Developing Versions + +For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot 2.x and 1.x once release : + +* `0.2.x` is a main stream release version for Spring Boot 2.x + +* [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) is a legacy version for maintaining Spring Boot 1.x + + +### Build from Source + +If you'd like to attempt to experience latest features, you also can build from source as follow: + +1. build source from [dubbo 2.6.2-SNAPSHOT](https://github.com/apache/incubator-dubbo/tree/2.6.2-release) +2. build source from current project. + -## Dependencies +### Dependencies -| versions | Java | Spring Boot | Dubbo | -| | - | - | -- | -| `0.2.0-SNAPSHOT` | 1.8 + | `2.0.x` | `2.6.2` + | -| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.x` | `2.6.2` + | +| versions | Java | Spring Boot | Dubbo | +| | - | --- | -- | +| `0.2.0` | 1.8 + | `2.0.x` | `2.6.2` + | +| `0.1.x` | 1.7 + | `1.5.x` | `2.6.2` + | -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 02/02: Update Document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit d94839864efaa7e166cad4efdb9617d88be14a51 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 22:55:48 2018 +0800 Update Document --- README.md| 7 +++--- README_CN.md | 71 ++-- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 71b099f..00fac97 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If your project failed to resolve the dependency, try to add the following repos For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot 2.x and 1.x once release : -* `0.2.x` is a main stream release version for Spring Boot 2.x +* [`0.2.x`](https://github.com/apache/incubator-dubbo-spring-boot-project) is a main stream release version for Spring Boot 2.x * [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) is a legacy version for maintaining Spring Boot 1.x @@ -52,8 +52,9 @@ For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot If you'd like to attempt to experience latest features, you also can build from source as follow: -1. build source from [dubbo 2.6.2-SNAPSHOT](https://github.com/apache/incubator-dubbo/tree/2.6.2-release) -2. build source from current project. +1. Maven install [dubbo 2.6.2-SNAPSHOT](https://github.com/apache/incubator-dubbo/tree/2.6.2-release) in your local repository +2. Maven install current project in your local repository. +> Maven install = `mvn install` ### Dependencies diff --git a/README_CN.md b/README_CN.md index 892d225..266e480 100644 --- a/README_CN.md +++ b/README_CN.md @@ -10,60 +10,61 @@ > Dubbo *|ˈdʌbəʊ|* is a high-performance, java based > [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call) framework > open-sourced by Alibaba. As in many RPC systems, dubbo is based around the > idea of defining a service, specifying the methods that can be called > remotely with their parameters and return types. On the server side, the > server implements this interface and runs a dubbo server to handle client > calls. On the client side, the client has a stub that provides the same > method [...] +## [English README](README_CN.md) -## 版本 +## 已发行版本 -从现在开始, `dubbo-spring-boot-project` 将在每个发布中发行两个版本 : - -* `0.2.x` 是支持 Spring Boot 2.x 的主要版本(推荐,长期维护) - -* [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) 是支持 Spring Boot 1.x 的维护版本(兼容,短期维护) - - -## Maven 整合 - -### 稳定版本 - -如果你希望使用稳定的 `dubbo-spring-boot-project`,您可以自行将以下 Maven 依赖添加到您的工程 pom.xml: +您可以为您的工程引入最新 `dubbo-spring-boot-starter` 的发布,增加以下依赖到工程的 `pom.xml` 文件中: +```xml + +com.alibaba.boot +dubbo-spring-boot-starter +0.1.0 + +``` +如果您的工程遇到了依赖问题, 请尝试添加如下 Maven 参考到工程的 `pom.xml` 文件中: ```xml - + + +sonatype-nexus-snapshots +https://oss.sonatype.org/content/repositories/snapshots + +false + + +true + + + +``` -... - - -com.alibaba.boot -dubbo-spring-boot-starter -0.2.0-SNAPSHOT - +## 开发版本 - - -com.alibaba.boot -dubbo-spring-boot-actuator -0.2.0-SNAPSHOT - +从现在开始, `dubbo-spring-boot-project` 将在每个发布中发行两个版本 : - ... +* [`0.2.x`](https://github.com/apache/incubator-dubbo-spring-boot-project) 是支持 Spring Boot 2.x 的主要版本(推荐,长期维护) - -``` +* [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) 是支持 Spring Boot 1.x 的维护版本(兼容,短期维护) -### 开发版本 -如果你需要尝试最新 `dubbo-spring-boot-project` 的特性,您可将当前工程手动 Maven install 到本地 Maven 仓库。 +### 源代码构建 +如果你需要尝试最新 `dubbo-spring-boot-project` 的特性,您可将当前工程手动 Maven install 到本地 Maven 仓库: +1. Maven install [dubbo 2.6.2-SNAPSHOT](https://github.com/apache/incubator-dubbo/tree/2.6.2-release) +2. Maven install 当前工程 +> Maven install = `mvn install` -## 依赖关系 +### 依赖关系 | 版本 | Java | Spring Boot | Dubbo | | | - | - | -- | -| `0.2.0-SNAPSHOT` | 1.8 + | `2.0.x` | `2.6.2` + | -| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.x` | `2.6.2` + | +| `0.2.0` | 1.8+ | `2.0.x` | `2.6.2`+ | +| `0.1.1` | 1.7+ | `1.5.x` | `2.6.2`+ | -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (d159e11 -> d948398)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from d159e11 Fixed test case issues new ea4e200 Update Document new d948398 Update Document The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md| 43 +--- README_CN.md | 71 ++-- 2 files changed, 62 insertions(+), 52 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update Document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 660cc79 Update Document 660cc79 is described below commit 660cc79da2321395c458b4dd09090c6aa981cff3 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 23:13:46 2018 +0800 Update Document --- README.md| 60 ++-- README_CN.md | 69 +++- 2 files changed, 52 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index 6395455..c31f1b7 100644 --- a/README.md +++ b/README.md @@ -5,48 +5,23 @@ * [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g., annotation-driven, auto configuration, externalized configuration). * [production-ready features](dubbo-spring-boot-actuator) (e.g., security, health checks, externalized configuration). - - > Dubbo *|ˈdʌbəʊ|* is a high-performance, java based > [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call) framework > open-sourced by Alibaba. As in many RPC systems, dubbo is based around the > idea of defining a service, specifying the methods that can be called > remotely with their parameters and return types. On the server side, the > server implements this interface and runs a dubbo server to handle client > calls. On the client side, the client has a stub that provides the same > method [...] -## [中文文档](README.md) - -## Versions +**Current Project is a legacy one for maintaining Spring Boot 1.x** -For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot 2.x and 1.x once release : +## [中文说明](README.md) -* `0.2.x` is a main stream release version for Spring Boot 2.x -* `0.1.x` is a legacy version for maintaining Spring Boot 1.x +## Released Version - - -## Integrate with Maven - -You can introduce the latest `dubbo-spring-boot-project` to your project by adding the following dependency to your pom.xml +You can introduce the latest `dubbo-spring-boot-starter` to your project by adding the following dependency to your pom.xml ```xml - - -... - - - -com.alibaba.boot -dubbo-spring-boot-starter -0.1.1-SNAPSHOT - - - - -com.alibaba.boot -dubbo-spring-boot-actuator -0.1.1-SNAPSHOT - - - ... - - + +com.alibaba.boot +dubbo-spring-boot-starter +0.1.0 + ``` If your project failed to resolve the dependency, try to add the following repository: @@ -66,14 +41,21 @@ If your project failed to resolve the dependency, try to add the following repos ``` +## Developing Version + +### Build from Source + +If you'd like to attempt to experience latest features, you also can build from source as follow: -## Dependencies +1. Maven install [dubbo 2.6.2-SNAPSHOT](https://github.com/apache/incubator-dubbo/tree/2.6.2-release) in your local repository +2. Maven install current project in your local repository. +> Maven install = `mvn install` -| versions | Java | Spring Boot | Dubbo | -| | - | - | -- | -| `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | -| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | +### Dependencies +| versions | Java | Spring Boot | Dubbo | +| | - | --- | -- | +| `0.1.1` | 1.7+ | `1.5.x` | `2.6.2` + | ## Getting Started diff --git a/README_CN.md b/README_CN.md index 66ace58..83d5775 100644 --- a/README_CN.md +++ b/README_CN.md @@ -11,59 +11,52 @@ > Dubbo *|ˈdʌbəʊ|* is a high-performance, java based > [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call) framework > open-sourced by Alibaba. As in many RPC systems, dubbo is based around the > idea of defining a service, specifying the methods that can be called > remotely with their parameters and return types. On the server side, the > server implements this interface and runs a dubbo server to handle client > calls. On the client side, the client has a stub that provides the same > method [...] +**当前工程是支持 Spring Boot 1.x 的维护工程** -## 版本 -从现在开始, `dubbo-spring-boot-project` 将在每个发布中发行两个版本 : - -* `0.2.x` 是支持 Spring Boot 2.x 的主要版本(推荐,长期维护) - -* `0.1.x` 是支持 Spring Boot 1.x 的维护版本(兼容,短期维护) - - -## Maven 整合 - -### 稳定版本 - -如果你希望使用稳定的 `dubbo-spring-boot-project`,您可以自行将以下 Maven 依赖添加到您的工程 pom.xml: +## 已发行版本 +您可以为您的工程引入最新 `dubbo-spring-boot-starter` 的发布,增加以下依赖到工程的 `pom.xml` 文件中: ```xml - - -... - - - -com.alibaba.boot -dubbo-spring-boot-starter -0.1.1-SNAPSHOT - - - - -com.alibaba.boot -dubbo-spring-boot-actuator -0.1.1-SNAPSHOT - - - ... + +com.alibaba.boot +d
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update version to be SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new ec59798 Update version to be SNAPSHOT ec59798 is described below commit ec597989810ac0b5fdad8117bfa08125bf21c3fd Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 21:52:36 2018 +0800 Update version to be SNAPSHOT --- dubbo-spring-boot-actuator/pom.xml | 2 +- dubbo-spring-boot-autoconfigure/pom.xml | 2 +- dubbo-spring-boot-parent/pom.xml| 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index 13c5706..5dd5291 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -5,7 +5,7 @@ dubbo-spring-boot-parent com.alibaba.boot -0.2.0 +0.2.0-SNAPSHOT ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index 024c0c7..283a326 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0 +0.2.0-SNAPSHOT ../dubbo-spring-boot-parent 4.0.0 diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 253a151..f5de0dc 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-project -0.2.0 +0.2.0-SNAPSHOT ../pom.xml diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml index d176061..ad0c802 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0 +0.2.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml index 73717d4..7057652 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0 +0.2.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml index 8f44c61..ff2b0ff 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0 +0.2.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml index ab824dc..1eb07cf 100644 --- a/dubbo-spring-boot-samples/pom.xml +++ b/dubbo-spring-boot-samples/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0 +0.2.0-SNAPSHOT ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot-starter/pom.xml index ff8351a..08846ee 100644 --- a/dubbo-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0 +0.2.0-SNAPSHOT ../dubbo-spring-boot-parent 4.0.0 diff --git a/pom.xml b/pom.xml index ad2119b..fc4be63 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.alibaba.boot dubbo-spring-boot-project -0.2.0 +0.2.0-SNAPSHOT pom -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated: Update README.md
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/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 21c50c2 Update README.md 21c50c2 is described below commit 21c50c252fdacf9baed6c1bd0c539377bc2f587a Author: 小马哥 AuthorDate: Tue Jun 12 17:19:43 2018 +0800 Update README.md Update http://dubbo.apache.org/ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e459219..c5a4c5e 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ If you'd like to attempt to experience latest features, you also can build from ## Getting Started -If you don't know about Dubbo, please take a few minutes to learn http://dubbo.io/. After that you could dive deep into dubbo [user guide](http://dubbo.apache.org/books/dubbo-user-book-en/). +If you don't know about Dubbo, please take a few minutes to learn http://dubbo.apache.org/. After that you could dive deep into dubbo [user guide](http://dubbo.apache.org/books/dubbo-user-book-en/). Usually, There are two usage scenarios for Dubbo applications, one is Dubbo service(s) provider, another is Dubbo service(s) consumer, thus let's get a quick start on them. -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated: Update README.md
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/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 01635fa Update README.md 01635fa is described below commit 01635faaa92fa5f77a94f49ce4ae9abb45ea758e Author: 小马哥 AuthorDate: Tue Jun 12 17:17:09 2018 +0800 Update README.md Fixed #170 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f0f00c8..e459219 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ If you'd like to attempt to experience latest features, you also can build from ## Getting Started -If you don't know about Dubbo, please take a few minutes to learn http://dubbo.io/. After that you could dive deep into dubbo [user guide](http://dubbo.io/books/dubbo-user-book-en/). +If you don't know about Dubbo, please take a few minutes to learn http://dubbo.io/. After that you could dive deep into dubbo [user guide](http://dubbo.apache.org/books/dubbo-user-book-en/). Usually, There are two usage scenarios for Dubbo applications, one is Dubbo service(s) provider, another is Dubbo service(s) consumer, thus let's get a quick start on them. -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated: Update README_CN.md
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/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new ccb0320 Update README_CN.md ccb0320 is described below commit ccb0320c56badbb2446c0381724ed445c9c09d88 Author: 小马哥 AuthorDate: Tue Jun 12 17:18:24 2018 +0800 Update README_CN.md Fixed #170 --- README_CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index a61660e..fadf2e5 100644 --- a/README_CN.md +++ b/README_CN.md @@ -68,7 +68,7 @@ ## 快速开始 -如果您对 Dubbo 不是非常了解,耽误您几分钟访问 http://dubbo.io/ 。了解后,如果你期望更深入的探讨,可以移步[用户手册](http://dubbo.io/books/dubbo-user-book/)。 +如果您对 Dubbo 不是非常了解,耽误您几分钟访问 http://dubbo.apache.org/ 。了解后,如果你期望更深入的探讨,可以移步[用户手册](http://dubbo.apache.org/books/dubbo-user-book/)。 通常情况 , Dubbo 应用有两种使用场景 , 其一为 Dubbo 服务提供方 , 另外一个是 Dubbo 服务消费方,当然也允许两者混合,下面我们一起快速开始! -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (577bacb -> e9c91b6)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 577bacb Merge pull request #164 from mercyblitz/0.2.0 add e6d3a49 Fixed apache/incubator-dubbo-spring-boot-project#143 add 95fc665 Fixed apache/incubator-dubbo-spring-boot-project#169 new e9c91b6 Merge pull request #173 from mercyblitz/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java | 1 - .../alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java | 1 - 2 files changed, 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #174 from mercyblitz/0.1.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 03a3c6091492d3434d037f734c250eab39702c8e Merge: 9c3bc92 c8a2103 Author: 小马哥 AuthorDate: Wed Jun 13 17:34:50 2018 +0800 Merge pull request #174 from mercyblitz/0.1.x 0.1.x .../com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java | 1 - .../alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java | 1 - 2 files changed, 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.x updated (9c3bc92 -> 03a3c60)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 9c3bc92 Merge pull request #163 from mercyblitz/0.1.x add 740ca80 Fixed apache/incubator-dubbo-spring-boot-project#143 add c8a2103 Fixed apache/incubator-dubbo-spring-boot-project#169 new 03a3c60 Merge pull request #174 from mercyblitz/0.1.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java | 1 - .../alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java | 1 - 2 files changed, 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (21c50c2 -> 1d85dcd)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 21c50c2 Update README.md add e6d3a49 Fixed apache/incubator-dubbo-spring-boot-project#143 add 95fc665 Fixed apache/incubator-dubbo-spring-boot-project#169 add e9c91b6 Merge pull request #173 from mercyblitz/0.2.0 new 1d85dcd Merge pull request #175 from apache/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java | 1 - .../alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java | 1 - 2 files changed, 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (e9c91b6 -> 9bf400c)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from e9c91b6 Merge pull request #173 from mercyblitz/0.2.0 add 94c13ff Merge pull request #165 from apache/0.2.0 add 01635fa Update README.md add ccb0320 Update README_CN.md add 21c50c2 Update README.md add 1d85dcd Merge pull request #175 from apache/0.2.0 new 9bf400c Merge pull request #176 from apache/master The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md| 2 +- README_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #176 from apache/master
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 9bf400c75c87d11ddea2a552dcd6af3707d971e2 Merge: e9c91b6 1d85dcd Author: 小马哥 AuthorDate: Wed Jun 13 17:37:45 2018 +0800 Merge pull request #176 from apache/master Update document README.md| 2 +- README_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.1 created (now 9c3bc92)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. at 9c3bc92 Merge pull request #163 from mercyblitz/0.1.x No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0-release updated: Update 0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0-release by this push: new 15028e1 Update 0.2.0 15028e1 is described below commit 15028e12a33d4d10b41051cb45e34b49c808399a Author: mercyblitz AuthorDate: Fri Jun 15 10:43:33 2018 +0800 Update 0.2.0 --- dubbo-spring-boot-actuator/README.md| 4 ++-- dubbo-spring-boot-actuator/pom.xml | 2 +- dubbo-spring-boot-autoconfigure/pom.xml | 2 +- dubbo-spring-boot-parent/pom.xml| 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 81d7b1a..103aa7d 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -33,7 +33,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad com.alibaba.boot dubbo-spring-boot-actuator -0.2.0-SNAPSHOT +0.2.0 ``` If your project failed to resolve the dependency, try to add the following repository: @@ -184,7 +184,7 @@ Actuator endpoint `dubbo` supports Actuator Endpoints : { "timestamp": 1516623290166, "versions": { -"dubbo-spring-boot": "0.2.0-SNAPSHOT" +"dubbo-spring-boot": "0.2.0" "dubbo": "2.6.2" }, "urls": { diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index 9dc507b..1d2c648 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -20,7 +20,7 @@ dubbo-spring-boot-parent com.alibaba.boot -0.2.0-SNAPSHOT +0.2.0 ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index 30a2f8d..602ee77 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0-SNAPSHOT +0.2.0 ../dubbo-spring-boot-parent 4.0.0 diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 048ec3a..0ff4436 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-project -0.2.0-SNAPSHOT +0.2.0 ../pom.xml diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml index e404c4d..e9f443a 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0-SNAPSHOT +0.2.0 ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml index 8c3df20..de5e37d 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0-SNAPSHOT +0.2.0 ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml index 3c10d44..281eb9a 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0-SNAPSHOT +0.2.0 ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml index 20c63a0..ad75b29 100644 --- a/dubbo-spring-boot-samples/pom.xml +++ b/dubbo-spring-boot-samples/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0-SNAPSH
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #181 from apache/0.2.0-release
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/incubator-dubbo-spring-boot-project.git commit dbe6d5f3c2ddcdf4863fb94a1ff84cdc3de94f67 Merge: 1d85dcd 15028e1 Author: 小马哥 AuthorDate: Fri Jun 15 10:45:52 2018 +0800 Merge pull request #181 from apache/0.2.0-release Update 0.2.0 dubbo-spring-boot-actuator/README.md| 4 ++-- dubbo-spring-boot-actuator/pom.xml | 2 +- dubbo-spring-boot-autoconfigure/pom.xml | 2 +- dubbo-spring-boot-parent/pom.xml| 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.1-release updated: Update version 0.1.1
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1-release by this push: new fa9110d Update version 0.1.1 fa9110d is described below commit fa9110d1e2740f63933cb72e4366f2c908c67d34 Author: mercyblitz AuthorDate: Fri Jun 15 10:41:35 2018 +0800 Update version 0.1.1 --- dubbo-spring-boot-actuator/README.md| 2 +- dubbo-spring-boot-actuator/README_CN.md | 4 ++-- dubbo-spring-boot-actuator/pom.xml | 2 +- dubbo-spring-boot-autoconfigure/README.md | 2 +- dubbo-spring-boot-autoconfigure/pom.xml | 2 +- dubbo-spring-boot-parent/pom.xml| 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 257d9f7..1a67d86 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -21,7 +21,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad com.alibaba.boot dubbo-spring-boot-actuator -0.1.1-SNAPSHOT +0.1.1 ``` If your project failed to resolve the dependency, try to add the following repository: diff --git a/dubbo-spring-boot-actuator/README_CN.md b/dubbo-spring-boot-actuator/README_CN.md index 8273780..2e64003 100644 --- a/dubbo-spring-boot-actuator/README_CN.md +++ b/dubbo-spring-boot-actuator/README_CN.md @@ -31,14 +31,14 @@ com.alibaba.boot dubbo-spring-boot-starter -0.1.1-SNAPSHOT +0.1.1 com.alibaba.boot dubbo-spring-boot-actuator -0.1.1-SNAPSHOT +0.1.1 ... diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index 4722459..a73c7cf 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -5,7 +5,7 @@ dubbo-spring-boot-parent com.alibaba.boot -0.1.1-SNAPSHOT +0.1.1 ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-autoconfigure/README.md b/dubbo-spring-boot-autoconfigure/README.md index 15aacb9..9490e7d 100644 --- a/dubbo-spring-boot-autoconfigure/README.md +++ b/dubbo-spring-boot-autoconfigure/README.md @@ -23,7 +23,7 @@ You can introduce the latest `dubbo-spring-boot-autoconfigure` to your project com.alibaba.boot dubbo-spring-boot-autoconfigure -0.1.1-SNAPSHOT +0.1.1 ``` diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index a272c29..54e0a4d 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.1.1-SNAPSHOT +0.1.1 ../dubbo-spring-boot-parent 4.0.0 diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 33198bf..4b5e48e 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-project -0.1.1-SNAPSHOT +0.1.1 ../pom.xml diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml index cbc9735..bfa59b7 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.1.1-SNAPSHOT +0.1.1 ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml index 3c3a578..c1b6594 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml @@ -5,7 +5,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.1.1-SNAPSHOT +0.1.1 ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample
[incubator-dubbo-spring-boot-project] branch master updated (1d85dcd -> dbe6d5f)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 1d85dcd Merge pull request #175 from apache/0.2.0 add 15028e1 Update 0.2.0 new dbe6d5f Merge pull request #181 from apache/0.2.0-release The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dubbo-spring-boot-actuator/README.md| 4 ++-- dubbo-spring-boot-actuator/pom.xml | 2 +- dubbo-spring-boot-autoconfigure/pom.xml | 2 +- dubbo-spring-boot-parent/pom.xml| 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo] branch master updated: support resolves property values. (#1895)
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/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new c459f6c support resolves property values. (#1895) c459f6c is described below commit c459f6c9afc43154fd9a9838f2dc96297dd0ce4d Author: wuwen AuthorDate: Fri Jun 8 11:12:31 2018 +0800 support resolves property values. (#1895) Ok for me --- .../alibaba/dubbo/config/spring/util/PropertySourcesUtils.java | 7 +-- .../dubbo/config/spring/util/PropertySourcesUtilsTest.java | 9 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtils.java b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtils.java index 5b183e1..c9a4d12 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtils.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtils.java @@ -19,6 +19,7 @@ package com.alibaba.dubbo.config.spring.util; import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySources; +import org.springframework.core.env.PropertySourcesPropertyResolver; import java.util.LinkedHashMap; import java.util.Map; @@ -46,13 +47,15 @@ public abstract class PropertySourcesUtils { String normalizedPrefix = normalizePrefix(prefix); +PropertySourcesPropertyResolver propertyResolver = new PropertySourcesPropertyResolver((PropertySources) propertySources); + for (PropertySource source : propertySources) { if (source instanceof EnumerablePropertySource) { for (String name : ((EnumerablePropertySource) source).getPropertyNames()) { if (name.startsWith(normalizedPrefix)) { String subName = name.substring(normalizedPrefix.length()); -Object value = source.getProperty(name); -subProperties.put(subName, String.valueOf(value)); +String value = propertyResolver.getProperty(name); +subProperties.put(subName, value); } } } diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java index 5dd526f..2840ecf 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java @@ -69,6 +69,15 @@ public class PropertySourcesUtilsTest { Assert.assertEquals(Collections.emptyMap(), result); +source.put(KEY_PREFIX + ".app.name", "${info.name}"); +source.put("info.name", "Hello app"); + +result = PropertySourcesUtils.getSubProperties(propertySources, KEY_PREFIX); + +String appName = result.get("app.name"); + +Assert.assertEquals("Hello app", appName); + } } -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.x updated (79a6cdf -> c99dc17)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 79a6cdf Merge pull request #133 from ralf0131/java10-ut add 506ff10 Update dubbo's version to be 2.6.2 new c99dc17 Merge pull request #158 from mercyblitz/0.1.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (53b9ff0 -> b84278c)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 53b9ff0 Sync pom.xml with ASF info. add e950bbf Update README_CN.md new b84278c Merge pull request #156 from boliuxyz/master The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README_CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #156 from boliuxyz/master
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/incubator-dubbo-spring-boot-project.git commit b84278cbb255d82808abe374b41499c60048ed7f Merge: 53b9ff0 e950bbf Author: 小马哥 AuthorDate: Wed Jun 6 11:21:38 2018 +0800 Merge pull request #156 from boliuxyz/master Update README_CN.md README_CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (5d52ba0 -> 6340b52)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 5d52ba0 Merge branch 'master' into 0.2.0 add 65dd7ac Update dubbo's version to be 2.6.2 new 6340b52 Merge pull request #159 from mercyblitz/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #159 from mercyblitz/0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 6340b524a609278e160d7355caad1e6060546c27 Merge: 5d52ba0 65dd7ac Author: 小马哥 AuthorDate: Wed Jun 6 11:20:59 2018 +0800 Merge pull request #159 from mercyblitz/0.2.0 Update dubbo's version to be 2.6.2 dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #158 from mercyblitz/0.1.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit c99dc173d6c1561b8edd9c824e69f26c56af25be Merge: 79a6cdf 506ff10 Author: 小马哥 AuthorDate: Wed Jun 6 11:20:34 2018 +0800 Merge pull request #158 from mercyblitz/0.1.x Update dubbo's version to be 2.6.2 dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #165 from apache/0.2.0
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/incubator-dubbo-spring-boot-project.git commit 94c13ffb4afe1c6685586aac5c6a08974ac1169d Merge: 8c7bd1e 577bacb Author: 小马哥 AuthorDate: Thu Jun 7 11:28:49 2018 +0800 Merge pull request #165 from apache/0.2.0 0.2.0 README.md | 3 +- README_CN.md| 3 +- dubbo-spring-boot-actuator/README_CN.md | 513 dubbo-spring-boot-parent/pom.xml| 2 +- 4 files changed, 516 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #164 from mercyblitz/0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 577bacb8cf812d9bfbee435c9e580960f5c06a56 Merge: 6340b52 d1d2537 Author: 小马哥 AuthorDate: Thu Jun 7 11:28:28 2018 +0800 Merge pull request #164 from mercyblitz/0.2.0 0.2.0 README.md | 3 +- README_CN.md| 7 +- dubbo-spring-boot-actuator/README_CN.md | 513 dubbo-spring-boot-parent/pom.xml| 2 +- pom.xml | 49 +-- 5 files changed, 543 insertions(+), 31 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.x updated (c99dc17 -> 9c3bc92)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from c99dc17 Merge pull request #158 from mercyblitz/0.1.x add 1dca14a Polish apache/incubator-dubbo-spring-boot-project#162 new 9c3bc92 Merge pull request #163 from mercyblitz/0.1.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (8c7bd1e -> 94c13ff)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 8c7bd1e Merge pull request #160 from apache/0.2.0 add 022278e Polish apache/incubator-dubbo-spring-boot-project#161 add d1d2537 Update Document add 577bacb Merge pull request #164 from mercyblitz/0.2.0 new 94c13ff Merge pull request #165 from apache/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 3 +- README_CN.md | 3 +- .../{README.md => README_CN.md}| 181 +++-- dubbo-spring-boot-parent/pom.xml | 2 +- 4 files changed, 94 insertions(+), 95 deletions(-) copy dubbo-spring-boot-actuator/{README.md => README_CN.md} (61%) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #163 from mercyblitz/0.1.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 9c3bc92f15b043b4cb30e040b05a4672107c9ae5 Merge: c99dc17 1dca14a Author: 小马哥 AuthorDate: Thu Jun 7 11:27:41 2018 +0800 Merge pull request #163 from mercyblitz/0.1.x Polish apache/incubator-dubbo-spring-boot-project#162 dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (6340b52 -> 577bacb)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 6340b52 Merge pull request #159 from mercyblitz/0.2.0 add 67c5ac4 Merge pull request #83 from apache/0.2.0 add 53b9ff0 Sync pom.xml with ASF info. add e950bbf Update README_CN.md add b84278c Merge pull request #156 from boliuxyz/master add 8c7bd1e Merge pull request #160 from apache/0.2.0 add 022278e Polish apache/incubator-dubbo-spring-boot-project#161 add d1d2537 Update Document new 577bacb Merge pull request #164 from mercyblitz/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 3 +- README_CN.md | 7 +- .../{README.md => README_CN.md}| 181 +++-- dubbo-spring-boot-parent/pom.xml | 2 +- pom.xml| 49 +++--- 5 files changed, 121 insertions(+), 121 deletions(-) copy dubbo-spring-boot-actuator/{README.md => README_CN.md} (61%) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #160 from apache/0.2.0
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/incubator-dubbo-spring-boot-project.git commit 8c7bd1e750f40decc93129bc169e022161e7fb5f Merge: b84278c 6340b52 Author: 小马哥 AuthorDate: Thu Jun 7 10:36:16 2018 +0800 Merge pull request #160 from apache/0.2.0 0.2.0 dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (b84278c -> 8c7bd1e)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from b84278c Merge pull request #156 from boliuxyz/master add 65dd7ac Update dubbo's version to be 2.6.2 add 6340b52 Merge pull request #159 from mercyblitz/0.2.0 new 8c7bd1e Merge pull request #160 from apache/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (dbe6d5f -> a656c14)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from dbe6d5f Merge pull request #181 from apache/0.2.0-release add f470547 add ci and codecov plugin add aaa89a2 add java 7 add 096e487 update shell add 9381eff revert ./mvnw add 4efac58 igonre test temporary add d7ac80b remomv jdk7 because springboot2 doee not support it new a656c14 Merge pull request #189 from lovepoem/add_ci_and_test_coverage The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .travis.yml| 10 +-- README.md | 6 README_CN.md | 6 ...DubboAutoConfigurationOnMultipleConfigTest.java | 3 ++ dubbo-spring-boot-parent/pom.xml | 33 ++ pom.xml| 6 +++- 6 files changed, 61 insertions(+), 3 deletions(-)
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #189 from lovepoem/add_ci_and_test_coverage
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/incubator-dubbo-spring-boot-project.git commit a656c14985fea604d2849712923eb47b69e49bf8 Merge: dbe6d5f d7ac80b Author: 小马哥 AuthorDate: Wed Jun 20 10:27:47 2018 +0800 Merge pull request #189 from lovepoem/add_ci_and_test_coverage add ci and codecov plugin .travis.yml| 10 +-- README.md | 6 README_CN.md | 6 ...DubboAutoConfigurationOnMultipleConfigTest.java | 3 ++ dubbo-spring-boot-parent/pom.xml | 33 ++ pom.xml| 6 +++- 6 files changed, 61 insertions(+), 3 deletions(-)
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update excludes
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 3da1097 Update excludes 3da1097 is described below commit 3da1097d6b17d4fd72a44114164a0b4efe3a1767 Author: mercyblitz AuthorDate: Thu Jun 21 10:31:16 2018 +0800 Update excludes --- dubbo-spring-boot-parent/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index cd6a73b..18e0917 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -321,8 +321,13 @@ PULL_REQUEST_TEMPLATE.md CONTRIBUTING.md README.md +README_CN.md **/codestyle/* **/resources/META-INF/** +**/*.factories +**/*.provides +**/*.properties +**/*.json
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update License position
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 230ce18 Update License position 230ce18 is described below commit 230ce18e544397f9e037839fb55efeccf469a717 Author: mercyblitz AuthorDate: Thu Jun 21 11:22:59 2018 +0800 Update License position --- .../main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java index f57c8e4..59bdfc1 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java @@ -1,4 +1,4 @@ -package com.alibaba.boot.dubbo.demo.consumer;/* +/* * 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. @@ -14,6 +14,7 @@ package com.alibaba.boot.dubbo.demo.consumer;/* * See the License for the specific language governing permissions and * limitations under the License. */ +package com.alibaba.boot.dubbo.demo.consumer; /** * Demo Service interface
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update excludes
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new c94eab4 Update excludes c94eab4 is described below commit c94eab445be6f92e519d177b4fa52955677f79ef Author: mercyblitz AuthorDate: Thu Jun 21 10:50:09 2018 +0800 Update excludes --- dubbo-spring-boot-parent/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 2321321..c3a79bd 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -336,8 +336,13 @@ PULL_REQUEST_TEMPLATE.md CONTRIBUTING.md README.md +README_CN.md **/codestyle/* **/resources/META-INF/** +**/*.factories +**/*.provides +**/*.properties +**/*.json
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update License
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 6834b7a Update License 6834b7a is described below commit 6834b7aa8454f2877689f1e665b40005c4d61260 Author: mercyblitz AuthorDate: Thu Jun 21 11:27:17 2018 +0800 Update License --- dubbo-spring-boot-parent/pom.xml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 18e0917..4dc85ef 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -1,3 +1,17 @@ + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Add exclude
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 3a06a8f Add exclude 3a06a8f is described below commit 3a06a8ff837435bcd90117ec855f456dd890cbf1 Author: mercyblitz AuthorDate: Thu Jun 21 11:36:23 2018 +0800 Add exclude --- dubbo-spring-boot-parent/pom.xml | 16 ++-- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index a9aa681..97999b9 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -1,17 +1,4 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> @@ -328,6 +315,7 @@ **/.project **/target/** **/*.log +pom.xml CODE_OF_CONDUCT.md .codecov.yml .travis.yml
[incubator-dubbo-spring-boot-project] branch 0.2.0-release updated: Update excludes (#195)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0-release by this push: new 3cc4c6b Update excludes (#195) 3cc4c6b is described below commit 3cc4c6b1a709764ec7d66c6c775ca146b43c208b Author: 小马哥 AuthorDate: Thu Jun 21 10:53:23 2018 +0800 Update excludes (#195)
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update License
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 53790bb Update License 53790bb is described below commit 53790bb62f72c66412542fa76cbe7cee124a6d0c Author: mercyblitz AuthorDate: Thu Jun 21 11:34:13 2018 +0800 Update License --- dubbo-spring-boot-parent/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 4dc85ef..a9aa681 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -11,8 +11,7 @@ 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. ---> - + --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;>
[incubator-dubbo-spring-boot-project] branch 0.1.x updated (3a06a8f -> 31395a4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 3a06a8f Add exclude add 75e7310 Merge pull request #191 from apache/0.1.x add e2ba6f0 0.1.x (#197) new 31395a4 Merge branch '0.1.1-release' into 0.1.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update License
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 506c3c3 Update License 506c3c3 is described below commit 506c3c302a18d133edcfe4d2f9ffb5c8031bd4b4 Author: mercyblitz AuthorDate: Thu Jun 21 11:45:19 2018 +0800 Update License --- dubbo-spring-boot-actuator/pom.xml | 17 - dubbo-spring-boot-autoconfigure/pom.xml| 17 - dubbo-spring-boot-parent/pom.xml | 18 -- .../dubbo-spring-boot-sample-api/pom.xml | 17 - .../dubbo-spring-boot-sample-consumer/pom.xml | 17 - .../dubbo-spring-boot-sample-provider/pom.xml | 17 - dubbo-spring-boot-samples/pom.xml | 17 - dubbo-spring-boot-starter/pom.xml | 17 - pom.xml| 16 9 files changed, 144 insertions(+), 9 deletions(-) diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index a73c7cf..079bd07 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -1,4 +1,19 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index 54e0a4d..043310c 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -1,4 +1,19 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 97999b9..0682e3d 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -1,4 +1,19 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> @@ -315,7 +330,6 @@ **/.project **/target/** **/*.log -pom.xml CODE_OF_CONDUCT.md .codecov.yml .travis.yml diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml index bfa59b7..971c9c1 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml @@ -1,4 +1,19 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml index c1b6594..3af5864 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml @@ -1,4 +1,19 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml index 070e3dc..647cf2d 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml @@ -1,4 +1,19 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml index 44a40da..16da5b0 100644 --- a/dubbo-spring-boot-samples/pom.xml +++ b/dubbo-spring-boot-samples/pom.xml @@ -1,4 +1,19 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #191 from apache/0.1.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 75e73101384337f24fe9cb4f428da18c46a4a613 Merge: fa9110d 1739ce1 Author: 小马哥 AuthorDate: Wed Jun 20 16:15:48 2018 +0800 Merge pull request #191 from apache/0.1.x 0.1.x .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update travis-ci configuration
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 27c4008 Update travis-ci configuration 27c4008 is described below commit 27c4008e89bec6ccbcd73f4db67fb124fb8bc6eb Author: mercyblitz AuthorDate: Wed Jun 20 16:14:42 2018 +0800 Update travis-ci configuration --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9764b2b..ef16343 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,3 +4,6 @@ jdk: - openjdk7 script: mvn clean package + +after_success: + - bash <(curl -s https://codecov.io/bash) -t 89f70bf5-4d6b-4759-8da0-dfab7881fd3e \ No newline at end of file
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Fix test cases
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new e8e2ff1 Fix test cases e8e2ff1 is described below commit e8e2ff1f608da5c47685c18f73d383d1bc32ab93 Author: mercyblitz AuthorDate: Wed Jun 20 16:25:32 2018 +0800 Fix test cases --- .../dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java index 75c950c..2852166 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java @@ -266,7 +266,7 @@ public class DubboAutoConfigurationOnMultipleConfigTest { @Test public void testSingleDubboConfigConfiguration() { -Assert.assertNull(singleDubboConfigConfiguration); +Assert.assertNotNull(singleDubboConfigConfiguration); }
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Fix CI issue
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new e216ee1 Fix CI issue e216ee1 is described below commit e216ee180d9db6c1ef75239616a1bcdbad703b81 Author: mercyblitz AuthorDate: Wed Jun 20 16:44:55 2018 +0800 Fix CI issue --- .travis.yml | 7 +-- dubbo-spring-boot-parent/pom.xml | 7 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef16343..958ca14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,12 @@ language: java +sudo: false # faster builds + jdk: +- oraclejdk10 +- oraclejdk9 - oraclejdk8 -- openjdk7 -script: mvn clean package +script: "mvn clean package" after_success: - bash <(curl -s https://codecov.io/bash) -t 89f70bf5-4d6b-4759-8da0-dfab7881fd3e \ No newline at end of file diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 048ec3a..e70db99 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -211,6 +211,13 @@ +maven-surefire-plugin +2.20.1 + +--add-modules java.xml.bind + + + org.apache.maven.plugins maven-enforcer-plugin
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Fix test cases
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 144bd39 Fix test cases 144bd39 is described below commit 144bd397b442042d620fb30d41203b1329e8ab18 Author: mercyblitz AuthorDate: Wed Jun 20 16:22:53 2018 +0800 Fix test cases --- .../dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java index 75c950c..2852166 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java @@ -266,7 +266,7 @@ public class DubboAutoConfigurationOnMultipleConfigTest { @Test public void testSingleDubboConfigConfiguration() { -Assert.assertNull(singleDubboConfigConfiguration); +Assert.assertNotNull(singleDubboConfigConfiguration); }
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Fix CI issue
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new d1c7b73 Fix CI issue d1c7b73 is described below commit d1c7b734a10af0c9ca1865f800f3376117f896d5 Author: mercyblitz AuthorDate: Wed Jun 20 17:05:38 2018 +0800 Fix CI issue --- dubbo-spring-boot-actuator/README.md | 4 +- dubbo-spring-boot-actuator/pom.xml | 2 +- dubbo-spring-boot-autoconfigure/pom.xml| 2 +- dubbo-spring-boot-parent/pom.xml | 62 ++ .../dubbo-spring-boot-sample-api/pom.xml | 2 +- .../dubbo-spring-boot-sample-consumer/pom.xml | 2 +- .../dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml| 2 +- 10 files changed, 61 insertions(+), 21 deletions(-) diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 81d7b1a..103aa7d 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -33,7 +33,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad com.alibaba.boot dubbo-spring-boot-actuator -0.2.0-SNAPSHOT +0.2.0 ``` If your project failed to resolve the dependency, try to add the following repository: @@ -184,7 +184,7 @@ Actuator endpoint `dubbo` supports Actuator Endpoints : { "timestamp": 1516623290166, "versions": { -"dubbo-spring-boot": "0.2.0-SNAPSHOT" +"dubbo-spring-boot": "0.2.0" "dubbo": "2.6.2" }, "urls": { diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index 9dc507b..1d2c648 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -20,7 +20,7 @@ dubbo-spring-boot-parent com.alibaba.boot -0.2.0-SNAPSHOT +0.2.0 ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index 30a2f8d..602ee77 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0-SNAPSHOT +0.2.0 ../dubbo-spring-boot-parent 4.0.0 diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index e70db99..b9a9c03 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-project -0.2.0-SNAPSHOT +0.2.0 ../pom.xml @@ -33,13 +33,25 @@ 1.8 +1.8 +1.8 UTF-8 UTF-8 -2.0.2.RELEASE +2.0.3.RELEASE 2.6.2 0.2 3.4.9 2.12.0 + +-server -Xms256m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8 +-Djava.net.preferIPv4Stack=true + + + +3.0.2 +3.6.0 +3.0.1 +0.8.1 1.5 0.12 @@ -190,6 +202,7 @@ org.apache.maven.plugins maven-jar-plugin +${maven-jar-plugin.version} true @@ -198,25 +211,51 @@ true true + + ${project.version} + ${project.version} + + org.apache.maven.plugins maven-compiler-plugin +${maven-compiler-plugin.version} -${java.version} -${java.version} -true +-proc:none +true +${java.source.version} +${java.target.version} +${file.encoding} + -maven-surefire-plugin -2.20.1 - ---add-modules java.xml.bind - +org.jacoco +jacoco-maven-plugin +${maven-jacoco-plugin.version} + + +
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update rat configuration
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 547a8fc Update rat configuration 547a8fc is described below commit 547a8fc618a2eeae5947be3c69261a2a9ab93b20 Author: mercyblitz AuthorDate: Wed Jun 20 17:39:28 2018 +0800 Update rat configuration --- dubbo-spring-boot-parent/pom.xml | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index b9a9c03..2321321 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -308,8 +308,19 @@ +**/*.versionsBackup **/.idea/ **/*.iml +**/*.txt +**/*.load +**/*.flex +**/*.fc +**/*.javascript +**/*.properties +**/*.thrift +**/*.sh +**/*.bat +**/*.md .git/ .gitignore @@ -319,13 +330,14 @@ **/.project **/target/** **/*.log +CODE_OF_CONDUCT.md .codecov.yml .travis.yml +PULL_REQUEST_TEMPLATE.md +CONTRIBUTING.md README.md **/codestyle/* -**/*.factories -**/*.provides -**/*.properties +**/resources/META-INF/**
[incubator-dubbo-ops] 01/01: Merge pull request #40 from lovepoem/add_rat_plugin_to_check_asf_header
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/incubator-dubbo-ops.git commit 728a95821a75e424d60faace06b29c1d88ce3793 Merge: c56ebac 3b48a2c Author: 小马哥 AuthorDate: Wed Jun 20 10:29:43 2018 +0800 Merge pull request #40 from lovepoem/add_rat_plugin_to_check_asf_header add ci and codecov plugin .travis.yml| 9 +++ README.md | 3 + dubbo-admin/pom.xml| 2 +- .../dubboadmin/DubboAdminApplicationTests.java | 6 +- pom.xml| 71 +++--- 5 files changed, 81 insertions(+), 10 deletions(-)
[incubator-dubbo-ops] branch master updated (c56ebac -> 728a958)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git. from c56ebac Merge pull request #37 from nzomkxia/admin-spring-boot add d3784bb add ci and codecov plugin add ecc5e61 remove codecov shell temporary add d516984 add spring exclude add f89d6e6 update jdk compile version add e3d1829 add test add 16817f2 ignore test temporary add 2a4841d revert java7 add bf6c084 revert java7 add 28ee082 remove jdk7 temporary add 76d3ee4 add java9 java10 add 3b48a2c reomve mvnw new 728a958 Merge pull request #40 from lovepoem/add_rat_plugin_to_check_asf_header The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .travis.yml| 9 +++ README.md | 3 + dubbo-admin/pom.xml| 2 +- .../dubboadmin/DubboAdminApplicationTests.java | 6 +- pom.xml| 71 +++--- 5 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 .travis.yml
[incubator-dubbo-spring-boot-project] branch master updated: Update codecov configuration
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/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 7193cf7 Update codecov configuration 7193cf7 is described below commit 7193cf75a7879ad503b5a164734206814c36c124 Author: mercyblitz AuthorDate: Wed Jun 20 10:46:40 2018 +0800 Update codecov configuration --- .travis.yml | 6 +++--- pom.xml | 20 +++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c8cf2a..ad3b3d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ jdk: - oraclejdk10 - oraclejdk9 - oraclejdk8 -script: -- travis_wait 30 ./mvnw clean package + +script: "mvn cobertura:cobertura" after_success: -- bash <(curl -s https://codecov.io/bash) \ No newline at end of file + - bash <(curl -s https://codecov.io/bash) -t 89f70bf5-4d6b-4759-8da0-dfab7881fd3e \ No newline at end of file diff --git a/pom.xml b/pom.xml index c89a926..601cafc 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,8 @@ https://github.com/apache/incubator-dubbo-spring-boot-project scm:git:git:github.com/apache/incubator-dubbo-spring-boot-project.git - scm:git:ssh://git@//github.com/apache/incubator-dubbo-spring-boot-project.git + scm:git:ssh://git@//github.com/apache/incubator-dubbo-spring-boot-project.git + @@ -125,4 +126,21 @@ + + + +org.codehaus.mojo +cobertura-maven-plugin +2.7 + + +html +xml + + + + + + + \ No newline at end of file
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update plugins
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new c035ccd Update plugins c035ccd is described below commit c035ccd55a179ae9e5d183b4ccff53da47796d4e Author: taogu.mxx AuthorDate: Thu Jun 21 17:52:37 2018 +0800 Update plugins --- dubbo-spring-boot-parent/pom.xml | 146 +++ pom.xml | 34 - 2 files changed, 146 insertions(+), 34 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index c3a79bd..0fb509c 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -46,6 +46,7 @@ -server -Xms256m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true + 3.0.2 @@ -54,6 +55,8 @@ 0.8.1 1.5 0.12 +2.5.3 +2.19.1 @@ -198,6 +201,31 @@ + + + +src/main/resources/ +false + + +../ +META-INF/ +false + +NOTICE +LICENSE + + + +../../ +META-INF/ +false + +NOTICE +LICENSE + + + org.apache.maven.plugins @@ -296,6 +324,77 @@ +org.apache.maven.plugins +maven-surefire-plugin +${maven-surefire-plugin.version} + +true +once +${argline} ${jacocoArgLine} + + + +transporter +${transporter} + + +serialization +${serialization} + + + +port +${port} + + +threadpool +${threadpool} + + +threads +${threads} + + +iothreads +${iothreads} + + + +server +${server} + + +timeout +${timeout} + + +length +${length} + + +connections +${connections} + + +base +${base} + + +concurrent +${concurrent} + + +runs +${runs} + + +onerror +${onerror} + + + + + org.apache.rat apache-rat-plugin ${apache-rat-plugin.version} @@ -348,6 +447,53 @@ + + +org.apache.maven.plugins +maven-release-plugin +${maven-release-plugin.version} + +true +false +release +deploy +${arguments} + + + + + +release + + + +org.apache.maven.plugins +maven-javadoc-plugin + + +package + +jar
[incubator-dubbo-spring-boot-project] branch master updated: update maven version to https://img.shields.io/maven-central/v/com.alibaba.boot/dubbo-spring-boot-starter.svg (#207)
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/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 34f1f3b update maven version to https://img.shields.io/maven-central/v/com.alibaba.boot/dubbo-spring-boot-starter.svg (#207) 34f1f3b is described below commit 34f1f3b4ad8384ab72d011fde37898e1135e53a4 Author: Xin Wang AuthorDate: Thu Jun 21 21:39:32 2018 +0800 update maven version to https://img.shields.io/maven-central/v/com.alibaba.boot/dubbo-spring-boot-starter.svg (#207) --- README.md| 2 +- README_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2daf656..f42f862 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![codecov](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project) [![Gitter](https://badges.gitter.im/alibaba/dubbo.svg)](https://gitter.im/alibaba/dubbo?utm_source=badge_medium=badge_campaign=pr-badge) ![license](https://img.shields.io/github/license/apache/incubator-dubbo-spring-boot-project.svg) -![maven](https://img.shields.io/maven-central/v/com.alibaba.boot/incubator-dubbo-spring-boot-project.svg) +![maven](https://img.shields.io/maven-central/v/com.alibaba.boot/dubbo-spring-boot-starter.svg) [Apache Dubbo(incubating)](https://github.com/apache/incubator-dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it aslo provides diff --git a/README_CN.md b/README_CN.md index 7cc0656..4a61c0c 100644 --- a/README_CN.md +++ b/README_CN.md @@ -4,7 +4,7 @@ [![codecov](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project) [![Gitter](https://badges.gitter.im/alibaba/dubbo.svg)](https://gitter.im/alibaba/dubbo?utm_source=badge_medium=badge_campaign=pr-badge) ![license](https://img.shields.io/github/license/apache/incubator-dubbo-spring-boot-project.svg) -![maven](https://img.shields.io/maven-central/v/com.alibaba.boot/incubator-dubbo-spring-boot-project.svg) +![maven](https://img.shields.io/maven-central/v/com.alibaba.boot/dubbo-spring-boot-starter.svg) [Dubbo](https://github.com/alibaba/dubbo) Spring Boot 工程致力于简化 Dubbo RPC 框架在 [Spring Boot](https://github.com/spring-projects/spring-boot/) 应用场景的开发。同时也整合了 Spring Boot 特性:
[incubator-dubbo-spring-boot-project] branch 0.1.1-release updated: 0.1.x (#208)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1-release by this push: new ec18fc1 0.1.x (#208) ec18fc1 is described below commit ec18fc17ae810ebaba4cc492f11541a388d2a36b Author: 小马哥 AuthorDate: Thu Jun 21 21:35:45 2018 +0800 0.1.x (#208) * Fix test cases * Update maven plugins * Update excludes * Update License position * Update License * Update License * Add exclude * Update License * Add maven-release-plugin * Fix JavaDoc Issues * Update build settings * Update plugins * Recover release profile * Update document --- README.md| 2 +- README_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c31f1b7..b6afe7e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi com.alibaba.boot dubbo-spring-boot-starter -0.1.0 +0.1.1 ``` diff --git a/README_CN.md b/README_CN.md index 83d5775..4d3d99b 100644 --- a/README_CN.md +++ b/README_CN.md @@ -21,7 +21,7 @@ com.alibaba.boot dubbo-spring-boot-starter -0.1.0 +0.1.1 ```
[incubator-dubbo-spring-boot-project] 01/01: Merge branch '0.2.0-release' into 0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 9c4eff2949441cb773b1896a3c2adb89f54b7c11 Merge: c123302 2f94888 Author: 小马哥 AuthorDate: Thu Jun 21 18:08:36 2018 +0800 Merge branch '0.2.0-release' into 0.2.0 README.md | 6 ++ README_CN.md | 6 ++ .../autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 2 ++ pom.xml | 8 ++-- 4 files changed, 20 insertions(+), 2 deletions(-)
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (c123302 -> 9c4eff2)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from c123302 Fix JavaDoc issues add 15028e1 Update 0.2.0 add ba2dfc9 Merge pull request #192 from apache/0.2.0 add 5f15ff1 Merge pull request #193 from apache/0.2.0 add dbe6d5f Merge pull request #181 from apache/0.2.0-release add f470547 add ci and codecov plugin add aaa89a2 add java 7 add 096e487 update shell add 9381eff revert ./mvnw add 4efac58 igonre test temporary add d7ac80b remomv jdk7 because springboot2 doee not support it add a656c14 Merge pull request #189 from lovepoem/add_ci_and_test_coverage add 7193cf7 Update codecov configuration add c4f29f2 Update .travis.yml add 2aa8d95 Merge branch 'master' into 0.2.0-release add 975f483 Update DubboAutoConfigurationOnMultipleConfigTest.java add c6984b6 Sync pom.xml from 0.2.0 branch add 3cc4c6b Update excludes (#195) add 2f94888 Merge remote-tracking branch 'origin/0.2.0-release' into 0.2.0-release new 9c4eff2 Merge branch '0.2.0-release' into 0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 6 ++ README_CN.md | 6 ++ .../autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 2 ++ pom.xml | 8 ++-- 4 files changed, 20 insertions(+), 2 deletions(-)
[incubator-dubbo-spring-boot-project] branch 0.1.1-release updated: 0.1.x (#206)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1-release by this push: new 56bb455 0.1.x (#206) 56bb455 is described below commit 56bb45558db38b27d16efbb6e621c9e6d48f69fa Author: 小马哥 AuthorDate: Thu Jun 21 21:24:32 2018 +0800 0.1.x (#206) * Fix test cases * Update maven plugins * Update excludes * Update License position * Update License * Update License * Add exclude * Update License * Add maven-release-plugin * Fix JavaDoc Issues * Update build settings * Update plugins * Recover release profile --- pom.xml | 33 + 1 file changed, 33 insertions(+) diff --git a/pom.xml b/pom.xml index 759645e..93a3d84 100644 --- a/pom.xml +++ b/pom.xml @@ -87,5 +87,38 @@ + + +release + + + +org.apache.maven.plugins +maven-javadoc-plugin + + +package + +jar + + + + + +org.apache.maven.plugins +maven-gpg-plugin + + +verify + +sign + + + + + + + + \ No newline at end of file
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new acd3154 Update document acd3154 is described below commit acd31545c4eb7aeda485608544b974bce5051cb2 Author: mercyblitz AuthorDate: Thu Jun 21 21:33:59 2018 +0800 Update document --- README.md| 2 +- README_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c31f1b7..b6afe7e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi com.alibaba.boot dubbo-spring-boot-starter -0.1.0 +0.1.1 ``` diff --git a/README_CN.md b/README_CN.md index 83d5775..4d3d99b 100644 --- a/README_CN.md +++ b/README_CN.md @@ -21,7 +21,7 @@ com.alibaba.boot dubbo-spring-boot-starter -0.1.0 +0.1.1 ```
[incubator-dubbo-spring-boot-project] branch 0.1.1-release updated: 0.1.x (#204)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1-release by this push: new f06683f 0.1.x (#204) f06683f is described below commit f06683fc0878e40e0bdaa3f77f289ccf1d83a2f3 Author: 小马哥 AuthorDate: Thu Jun 21 21:11:45 2018 +0800 0.1.x (#204) * Fix test cases * Update maven plugins * Update excludes * Update License position * Update License * Update License * Add exclude * Update License * Add maven-release-plugin * Fix JavaDoc Issues * Update build settings * Update plugins --- dubbo-spring-boot-parent/pom.xml | 36 +--- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index b08fb6d..b7733d9 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -463,39 +463,5 @@ - - - -release - - - -org.apache.maven.plugins -maven-javadoc-plugin - - -package - -jar - - - - - -org.apache.maven.plugins -maven-gpg-plugin - - -verify - -sign - - - - - - - - - + \ No newline at end of file
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Fix JavaDoc Issues
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 4416053 Fix JavaDoc Issues 4416053 is described below commit 4416053f20a6c6411a14d3a3a27e4c122c44ac04 Author: taogu.mxx AuthorDate: Thu Jun 21 17:25:55 2018 +0800 Fix JavaDoc Issues --- .../DubboMvcEndpointManagementContextConfiguration.java | 2 +- .../alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java| 2 +- .../boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java| 1 - .../com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java | 5 +++-- .../dubbo/context/event/OverrideDubboConfigApplicationListener.java | 3 ++- .../boot/dubbo/context/event/WelcomeLogoApplicationListener.java | 2 +- .../src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java| 1 - .../boot/dubbo/demo/consumer/controller/DemoConsumerController.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java index 18a44a1..d2a405c 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; * Dubbo {@link MvcEndpoint} {@link ManagementContextConfiguration} * * @author mailto:mercybl...@gmail.com;>Mercy - * @see + * @see ManagementContextConfiguration * @since 1.0.0 */ @ManagementContextConfiguration diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java index 125cd34..f11c575 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java @@ -63,7 +63,7 @@ import static org.springframework.util.ClassUtils.isPrimitiveOrWrapper; * {@link MvcEndpoint} to expose Dubbo Metadata * * @author mailto:mercybl...@gmail.com;>Mercy - * @see + * @see MvcEndpoint * @since 1.0.0 */ public class DubboMvcEndpoint extends EndpointMvcAdapter implements ApplicationContextAware, EnvironmentAware { diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java index bd35ed9..9232cba 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java @@ -53,7 +53,6 @@ public class DubboHealthIndicatorProperties { /** * The nested class for {@link StatusChecker}'s names - * * * registry=com.alibaba.dubbo.registry.status.RegistryStatusChecker * spring=com.alibaba.dubbo.config.spring.status.SpringStatusChecker diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java index 251934a..f3060b1 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java @@ -70,9 +70,9 @@ public class DubboAutoConfiguration { } /** - * Multiple Dubbo Config Configuration , equals {@link EnableDubboConfig#multiple()} == true + * Multiple Dubbo Config Configuration , equals @EnableDubboConfig.multiple() == true * - * @see EnableDubboConfig#multiple() + * @see EnableDubboConfig * @see DubboConfigConfiguration.Multiple */ @ConditionalOnProperty(name = MULTIPLE_CONFIG_PROPERTY_NAME, havingValue = "true") @@ -83,6 +83,7 @@ public class DubboAutoConfiguration { /** * Creates {@link ServiceAnnotationBeanPostProcessor} Bean * + * @param environment {@link Environment} Bean * @return {@link ServiceAnnotationB
[incubator-dubbo-spring-boot-project] branch 0.1.1-release updated: 0.1.x (#200)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1-release by this push: new 1db4fdd 0.1.x (#200) 1db4fdd is described below commit 1db4fdd8daef52b6de02c3471c04ee3e2c79e9c8 Author: 小马哥 AuthorDate: Thu Jun 21 17:49:12 2018 +0800 0.1.x (#200) * Fix test cases * Update maven plugins * Update excludes * Update License position * Update License * Update License * Add exclude * Update License * Add maven-release-plugin * Fix JavaDoc Issues * Update build settings --- ...oMvcEndpointManagementContextConfiguration.java | 2 +- .../actuate/endpoint/mvc/DubboMvcEndpoint.java | 2 +- .../health/DubboHealthIndicatorProperties.java | 1 - .../autoconfigure/DubboAutoConfiguration.java | 5 +- .../OverrideDubboConfigApplicationListener.java| 3 +- .../event/WelcomeLogoApplicationListener.java | 2 +- .../com/alibaba/boot/dubbo/util/DubboUtils.java| 1 - dubbo-spring-boot-parent/pom.xml | 147 + .../controller/DemoConsumerController.java | 2 +- pom.xml| 33 - 10 files changed, 156 insertions(+), 42 deletions(-) diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java index 18a44a1..d2a405c 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboMvcEndpointManagementContextConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; * Dubbo {@link MvcEndpoint} {@link ManagementContextConfiguration} * * @author mailto:mercybl...@gmail.com;>Mercy - * @see + * @see ManagementContextConfiguration * @since 1.0.0 */ @ManagementContextConfiguration diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java index 125cd34..f11c575 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpoint.java @@ -63,7 +63,7 @@ import static org.springframework.util.ClassUtils.isPrimitiveOrWrapper; * {@link MvcEndpoint} to expose Dubbo Metadata * * @author mailto:mercybl...@gmail.com;>Mercy - * @see + * @see MvcEndpoint * @since 1.0.0 */ public class DubboMvcEndpoint extends EndpointMvcAdapter implements ApplicationContextAware, EnvironmentAware { diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java index bd35ed9..9232cba 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java @@ -53,7 +53,6 @@ public class DubboHealthIndicatorProperties { /** * The nested class for {@link StatusChecker}'s names - * * * registry=com.alibaba.dubbo.registry.status.RegistryStatusChecker * spring=com.alibaba.dubbo.config.spring.status.SpringStatusChecker diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java index 251934a..f3060b1 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java @@ -70,9 +70,9 @@ public class DubboAutoConfiguration { } /** - * Multiple Dubbo Config Configuration , equals {@link EnableDubboConfig#multiple()} == true + * Multiple Dubbo Config Configuration , equals @EnableDubboConfig.multiple() == true * - * @see EnableDubboConfig#multiple() + * @see EnableDubboConfig * @see DubboConfigConfiguration.Multiple */ @ConditionalOnPropert
[incubator-dubbo-spring-boot-project] branch 0.2.0-release updated: 0.2.0 (#202)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0-release by this push: new 9b655af 0.2.0 (#202) 9b655af is described below commit 9b655af3a5647d1e1f53ce8305e3bf25512bd837 Author: 小马哥 AuthorDate: Thu Jun 21 20:31:03 2018 +0800 0.2.0 (#202) * Update excludes * Update plugins * Fix JavaDoc issues * Update plugins --- dubbo-spring-boot-parent/pom.xml | 33 - pom.xml | 34 ++ 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 0fb509c..cfce3f3 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -463,37 +463,4 @@ - - -release - - - -org.apache.maven.plugins -maven-javadoc-plugin - - -package - -jar - - - - - -org.apache.maven.plugins -maven-gpg-plugin - - -verify - -sign - - - - - - - - diff --git a/pom.xml b/pom.xml index 249930b..a68c9f0 100644 --- a/pom.xml +++ b/pom.xml @@ -91,4 +91,38 @@ + + +release + + + +org.apache.maven.plugins +maven-javadoc-plugin + + +package + +jar + + + + + +org.apache.maven.plugins +maven-gpg-plugin + + +verify + +sign + + + + + + + + + \ No newline at end of file
[incubator-dubbo-spring-boot-project] 01/01: Merge branch '0.2.0-release' into 0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 0473110fcc60da1250c94ba43156db7a261160cf Merge: 55230d6 0734592 Author: 小马哥 AuthorDate: Thu Jun 21 20:30:54 2018 +0800 Merge branch '0.2.0-release' into 0.2.0
[incubator-dubbo-spring-boot-project] branch master updated: Update version to be 0.2.1-SNAPSHOT
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/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 314b04e Update version to be 0.2.1-SNAPSHOT 314b04e is described below commit 314b04e791b2c14ea087ab0d02da61dd4f1f6c46 Author: mercyblitz AuthorDate: Thu Jun 21 21:45:13 2018 +0800 Update version to be 0.2.1-SNAPSHOT --- dubbo-spring-boot-actuator/pom.xml | 2 +- dubbo-spring-boot-autoconfigure/pom.xml | 2 +- dubbo-spring-boot-parent/pom.xml| 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml | 2 +- dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index 1d2c648..70e8f20 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -20,7 +20,7 @@ dubbo-spring-boot-parent com.alibaba.boot -0.2.0 +0.2.1-SNAPSHOT ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index 602ee77..1e892fa 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0 +0.2.1-SNAPSHOT ../dubbo-spring-boot-parent 4.0.0 diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index cfce3f3..b22a36d 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-project -0.2.0 +0.2.1-SNAPSHOT ../pom.xml diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml index e9f443a..bac2c4c 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0 +0.2.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml index de5e37d..dec0ef0 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0 +0.2.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml index 281eb9a..1dc600b 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-samples -0.2.0 +0.2.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml index ad75b29..a1917a0 100644 --- a/dubbo-spring-boot-samples/pom.xml +++ b/dubbo-spring-boot-samples/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0 +0.2.1-SNAPSHOT ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot-starter/pom.xml index 073085c..cc966fa 100644 --- a/dubbo-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.alibaba.boot dubbo-spring-boot-parent -0.2.0 +0.2.1-SNAPSHOT ../dubbo-spring-boot-parent 4.0.0 diff --git a/pom.xml b/pom.xml index a68c9f0..a590d80 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ com.alibaba.boot dubbo-spring-boot-project -0.2.0 +0.2.1-SNAPSHOT pom
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #97 from nzomkxia/master
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/incubator-dubbo-spring-boot-project.git commit 59a6144ab53462683e72b0f30584402a9470fff4 Merge: 584a8d6 bb99127 Author: Mercy <mercybl...@gmail.com> AuthorDate: Sat Apr 7 20:29:54 2018 +0800 Merge pull request #97 from nzomkxia/master update readme README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo] branch master updated: Fix #1539, change log method (#1578)
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/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new d80a42c Fix #1539, change log method (#1578) d80a42c is described below commit d80a42cc69d16d3cb3391ba9f5ec2cc64436839f Author: Jerrick Zhu <diecui1...@gmail.com> AuthorDate: Tue Apr 10 16:23:27 2018 +0800 Fix #1539, change log method (#1578) --- .../alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java index 0a038c7..0269c2b 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java +++ b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java @@ -83,7 +83,7 @@ public class MockClusterInvoker implements Invoker { throw e; } else { if (logger.isWarnEnabled()) { -logger.info("fail-mock: " + invocation.getMethodName() + " fail-mock enabled , url : " + directory.getUrl(), e); +logger.warn("fail-mock: " + invocation.getMethodName() + " fail-mock enabled , url : " + directory.getUrl(), e); } result = doMockInvoke(invocation, e); } -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo] branch master updated: Update xml namespace and schema location #1629 (#1633)
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/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new d43faf4 Update xml namespace and schema location #1629 (#1633) d43faf4 is described below commit d43faf447bf7e9b99ce189fe60f176e094920d39 Author: Huxing Zhang <huxing.zh...@gmail.com> AuthorDate: Fri Apr 20 16:02:34 2018 +0800 Update xml namespace and schema location #1629 (#1633) Fine --- .../dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd | 4 ++-- .../dubbo-config-spring/src/main/resources/META-INF/spring.handlers | 2 +- .../dubbo-config-spring/src/main/resources/META-INF/spring.schemas | 2 +- .../test/resources/META-INF/spring/dubbo-annotation-consumer.xml| 5 ++--- .../test/resources/META-INF/spring/dubbo-annotation-provider.xml| 4 ++-- .../src/test/resources/META-INF/spring/dubbo-consumer.xml | 5 ++--- .../src/test/resources/META-INF/spring/dubbo-provider.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/annotation-consumer.xml | 5 ++--- .../com/alibaba/dubbo/config/spring/annotation-provider.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/annotation-version-consumer.xml | 5 ++--- .../com/alibaba/dubbo/config/spring/annotation-version-provider.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/aop-autowire-byname.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/aop-autowire-bytype.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/customize-parameter.xml | 5 ++--- .../resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/delay-on-initialized.xml| 4 ++-- .../alibaba/dubbo/config/spring/demo-provider-UnserializableBox.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/demo-provider-long-waiting.xml | 5 ++--- .../dubbo/config/spring/demo-provider-no-methods-interface.xml | 4 ++-- .../resources/com/alibaba/dubbo/config/spring/demo-provider.xml | 5 ++--- .../resources/com/alibaba/dubbo/config/spring/generic-export.xml| 4 ++-- .../com/alibaba/dubbo/config/spring/init-reference-getUrls.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/init-reference-retry-false.xml | 4 ++-- .../resources/com/alibaba/dubbo/config/spring/init-reference.xml| 4 ++-- .../com/alibaba/dubbo/config/spring/multi-protocol-default.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/multi-protocol-error.xml| 4 ++-- .../com/alibaba/dubbo/config/spring/multi-protocol-register.xml | 4 ++-- .../resources/com/alibaba/dubbo/config/spring/multi-protocol.xml| 4 ++-- .../resources/com/alibaba/dubbo/config/spring/multi-registry.xml| 4 ++-- .../com/alibaba/dubbo/config/spring/override-multi-protocol.xml | 4 ++-- .../resources/com/alibaba/dubbo/config/spring/override-protocol.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/provider-nested-service.xml | 4 ++-- .../resources/com/alibaba/dubbo/config/spring/service-class.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/spring-extension-inject.xml | 4 ++-- .../dubbo/config/spring/system-properties-override-default.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/system-properties-override.xml | 4 ++-- .../com/alibaba/dubbo/config/spring/xml-override-properties.xml | 4 ++-- .../src/main/resources/META-INF/spring/dubbo-demo-consumer.xml | 4 ++-- .../src/main/resources/META-INF/spring/dubbo-demo-provider.xml | 4 ++-- .../dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml | 4 ++-- .../dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml | 4 ++-- .../dubbo-test-benchmark/src/main/resources/ProviderSample.xml | 6 +++--- .../src/main/resources/META-INF/spring/dubbo-consumer.xml | 4 ++-- .../src/main/resources/META-INF/spring/dubbo-provider.xml | 4 ++-- .../main/java/com/alibaba/dubbo/examples/async/async-consumer.xml | 4 ++-- .../main/java/com/alibaba/dubbo/examples/async/async-provider.xml | 4 ++-- .../main/java/com/alibaba/dubbo/examples/cache/cache-consumer.xml | 4 ++-- .../main/java/com/alibaba/dubbo/examples/cache/cache-provider.xml | 4 ++-- .../java/com/alibaba/dubbo/examples/callback/callback-consumer.xml | 4 ++-- .../java/com/alibaba/dubbo/examples/callback/callback-provider.xml | 4 ++-- .../java/com/alibaba/dubbo/examples/generic/generic-consumer.xml| 4 ++-- .../java/com/alibaba/dubbo/examples/generic/generic-provider.xml| 4 ++-- .../com/alibaba/dubbo/examples/heartbeat/heartbeat-consumer.xml | 4 ++-- .../com/alibaba/dubbo/examples/heartbeat/heartbeat-provider.xml | 4 ++-- .../com/alibaba/dubbo/examples/memcached/memcached-consumer.xml | 4 ++-- .../main/java/com/alibaba/dubbo/examples/merge/merge-consumer.xml | 4 ++-- .../main/java/com/alibaba/dubbo/examples/merge
[incubator-dubbo-spring-boot-project] branch 0.1.x created (now b303778)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. at b303778 Remove log4j No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Remove log4j
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 5f9a8f5 Remove log4j 5f9a8f5 is described below commit 5f9a8f53a91ce8e2251badf54dba4fd2888a8645 Author: taogu.mxx <taogu@taobao.com> AuthorDate: Wed Mar 28 11:21:31 2018 +0800 Remove log4j --- dubbo-spring-boot-parent/pom.xml | 8 1 file changed, 8 insertions(+) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 3365979..871c3af 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -54,6 +54,10 @@ javax.servlet servlet-api + +log4j +log4j + @@ -67,6 +71,10 @@ org.slf4j slf4j-log4j12 + +log4j +log4j + -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Polish samples #67
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 002743f Polish samples #67 002743f is described below commit 002743f7de2dcc460f1847a454934ad99dcfeb05 Author: taogu.mxx <taogu@taobao.com> AuthorDate: Wed Mar 28 11:13:20 2018 +0800 Polish samples #67 --- .../demo/consumer/controller/DemoConsumerController.java| 2 +- .../src/main/resources/application.properties | 3 +++ .../dubbo/demo/provider/service/DefaultDemoService.java | 2 +- .../src/main/resources/application.properties | 13 +++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/java/com/alibaba/boot/dubbo/demo/consumer/controller/DemoConsumerController.java b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/java/com/alibaba/boot/dubbo/demo/consumer/controller/DemoConsumerController.java index d410d90..5b105d6 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/java/com/alibaba/boot/dubbo/demo/consumer/controller/DemoConsumerController.java +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/java/com/alibaba/boot/dubbo/demo/consumer/controller/DemoConsumerController.java @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class DemoConsumerController { -@Reference(version = "1.0.0", +@Reference(version = "${demo.service.version}", application = "${dubbo.application.id}", url = "dubbo://localhost:12345") private DemoService demoService; diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/resources/application.properties b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/resources/application.properties index b794b88..df91988 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/resources/application.properties +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/src/main/resources/application.properties @@ -3,6 +3,9 @@ spring.application.name = dubbo-consumer-demo server.port = 8080 management.server.port = 8081 +# DemoService service version +demo.service.version = 1.0.0 + # Dubbo Config properties ## ApplicationConfig Bean dubbo.application.id = dubbo-consumer-demo diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java index 79a9626..48bfc22 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java @@ -27,7 +27,7 @@ import com.alibaba.dubbo.config.annotation.Service; * @since 1.0.0 */ @Service( -version = "1.0.0", +version = "${demo.service.version}", application = "${dubbo.application.id}", protocol = "${dubbo.protocol.id}", registry = "${dubbo.registry.id}" diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/src/main/resources/application.properties b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/src/main/resources/application.properties index 179eb87..876eedb 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/src/main/resources/application.properties +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/src/main/resources/application.properties @@ -2,6 +2,10 @@ spring.application.name = dubbo-provider-demo server.port = 9090 + +# DemoService service version +demo.service.version = 1.0.0 + # Base packages to scan Dubbo Components (e.g @Service , @Reference) dubbo.scan.basePackages = com.alibaba.boot.dubbo.demo.provider.service @@ -23,8 +27,13 @@ dubbo.protocol.status = server dubbo.registry.id = my-registry dubbo.registry.address = N/A -# Dubbo Endpoint (default status is disable) -endpoints.dubbo.enabled = true +# Enables Dubbo All Endpoints +management.endpoint.dubbo.enabled = true +management.endpoint.dubbo-shutdown.enabled = true +management.endpoint.dubbo-configs.enabled = true +management.endpoint.dubbo-services.enabled = true +management.endpoint.dubbo-references.enabled = true +management.endpoint.dubbo-properties.enabled = true # Dubbo Health ## StatusChecker Name default
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Polish #78 #57 #37
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 45813e4 Polish #78 #57 #37 45813e4 is described below commit 45813e4630948b8834e4f0ec9f6387676bdf7350 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Wed Mar 28 00:12:28 2018 +0800 Polish #78 #57 #37 --- dubbo-spring-boot-actuator/JMX_HealthEndpoint.png | Bin 284819 -> 230227 bytes dubbo-spring-boot-actuator/README.md | 109 +- .../DubboEndpointsAutoConfiguration.java | 83 ++ .../DubboHealthIndicatorAutoConfiguration.java |4 +- ...oMvcEndpointManagementContextConfiguration.java | 49 - .../actuate/endpoint/AbstractDubboEndpoint.java| 123 +++ .../endpoint/DubboConfigsMetadataEndpoint.java | 79 ++ .../boot/dubbo/actuate/endpoint/DubboEndpoint.java | 35 +- .../DubboPropertiesEndpoint.java} | 35 +- .../endpoint/DubboReferencesMetadataEndpoint.java | 73 ++ .../endpoint/DubboServicesMetadataEndpoint.java| 86 ++ .../actuate/endpoint/DubboShutdownEndpoint.java| 82 ++ .../actuate/endpoint/mvc/DubboMvcEndpoint.java | 459 .../META-INF/dubbo-web-endpoins-default.properties | 22 + .../src/main/resources/META-INF/spring.factories |7 +- .../dubbo/actuate/endpoint/DubboEndpointTest.java |9 - ...va => DubboEndpointsAutoConfigurationTest.java} | 72 +- .../actuate/endpoint/mvc/DubboMvcEndpointTest.java | 380 +++ .../autoconfigure/DubboAutoConfiguration.java | 11 +- .../autoconfigure/RelaxedDubboConfigBinder.java| 50 +- .../event/AwaitingNonWebApplicationListener.java |3 +- .../event/WelcomeLogoApplicationListener.java |2 +- .../META-INF/spring-configuration-metadata.json| 1098 dubbo-spring-boot-parent/pom.xml |4 +- .../dubbo-spring-boot-sample-consumer/pom.xml |8 +- .../src/main/resources/application.properties | 16 +- .../dubbo-spring-boot-sample-provider/pom.xml |8 +- .../demo/provider/bootstrap/DubboProviderDemo.java |3 +- .../src/main/resources/application.properties |2 - dubbo-spring-boot-starter/pom.xml |6 +- 30 files changed, 2031 insertions(+), 887 deletions(-) diff --git a/dubbo-spring-boot-actuator/JMX_HealthEndpoint.png b/dubbo-spring-boot-actuator/JMX_HealthEndpoint.png index 7975cd8..18e9f92 100644 Binary files a/dubbo-spring-boot-actuator/JMX_HealthEndpoint.png and b/dubbo-spring-boot-actuator/JMX_HealthEndpoint.png differ diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 39d8c41..ac020f3 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -21,7 +21,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad com.alibaba.boot dubbo-spring-boot-actuator -0.1.1 +0.2.0 ``` If your project failed to resolve the dependency, try to add the following repository: @@ -48,11 +48,11 @@ If your project failed to resolve the dependency, try to add the following repos -### MVC Endpoint : `/health` +### Web Endpoint : `/health` -Suppose a Spring Boot Web application did not specify `management.port`, you can access http://localhost:8080/health via Web Client and will get a response with JSON format is like below : +Suppose a Spring Boot Web application did not specify `management.server.port`, you can access http://localhost:8080/actuator/health via Web Client and will get a response with JSON format is like below : ```json { @@ -96,21 +96,24 @@ Suppose a Spring Boot Web application did not specify `management.port`, you can } ``` -In [samples](../dubbo-spring-boot-samples/) , `/health` MVC Endpoints are exposed on http://localhost:9091/health ([provider](../dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider)) and http://localhost:8081/health ([consumer](../dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer)) +In [samples](../dubbo-spring-boot-samples/) , `/health` Web Endpoints are exposed on http://localhost:8081/health +([consumer](../dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer)) - `memory`, `load`, `threadpool` and `server` are Dubbo's build-in `StatusChecker`s in above example. Dubbo allows the application to extend `StatusChecker`'s SPI. + `memory`, `load`, `threadpool` and `server` are Dubbo's build-in `StatusChecker`s in above example. + Dubbo allows the application to extend `StatusChecker`'s SPI. -Default , `memory` and `load` will be added into Dubbo's `HealthIndicator` , it could be overridden by externalized configuration [`StatusChecker`'s defaults](#statuschecker-defaults). +Default , `memor
[incubator-dubbo] branch 2.5.x updated (4f34540 -> 6e38481)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. from 4f34540 Manually merge pull request #1486, to make travis ci and codecov work after apache incubator transition. add ab8af67 Merge pull request from #1001, merge dubbox branch add 20fff01 Upgrade serialization integration of kryo and fst add f4dfc6e Revert modification of core dubbo RPC protocol add 17aa99e Upgrade rest integration add 0602317 Add apache license and remove author info add c805904 Remove useless container integration add cf3a54e Add test example for rest add 12e4d1c Add service level `serialization` config add 75ed5f5 Delete OptimizedSerialization add e0a9cbf Adjust dependencies in pom.xml relating with rest add 8ad8757 Upgrade netty4 version add 739a61e Upgrade version to 2.6.0 add eae1367 Add version for resteasy dependency add 5f02aa6 Degrade the resteasy and netty version for jdk1.7 compatibility. add 7e59712 Fix typo add 22bb9cb Fix typo of resteasy version in dubbo-maven add 26f39d5 Refactor project structure using maven add 9893bd6 Change module name add da3783e Upgrade version to 2.6.1 add e62d3ff Remove classes related with "dubbo-monitor" add 9871e6a Upgrade version to 2.6.1 add 4413886 Remove maven "provided" config in pom.xml of sub-modules add ca11537 Remove dubbo-admin, why it appears? add 926a719 Remove useless readme.md add 7cfa205 Merge pull request from #1170, fix typo of SUFFIXES. add 8031ba6 获取Serializer和Deserializer时,高并发情况下线程block (#1196) add 4a5b189 Merge branch 'master' of https://github.com/alibaba/dubbo add 5c3c29b recover -Xdoclint:none temperary add 77f03a5 add javadoc.opts to adapt java7 and java 8 add 267292e Fixed #1186, change the default ZK client from `zkclient` to `curator` add 6160d3e Fixed #1226, enhance netty support for rest protocol add 9cb9426 Add comment add 09722e3 Remove unnecessary dependencies add c7cd889 Merge pull request #1236, fix typo in FailbackRegistry. add 8eb0d6f Remove useless dependencies add 2108d8f Update README.md add 74f7074 add dubbo-ops link add 5b0ab11 remove hot symbol add a4632da Merge branch '2.5.x' add d1292c2 Add "source" configuration to JdkCompiler add 2f7f91c Remove unnecessary transitive dependencies add 9ca9bb0 Fix typo #1260 add daac568 Remove slf4j-log4j12 dependency add 98c548a add config for travis ci fail when test case fail (#1264) add 61d7178 Merge pull request #1333, remove unnecessary maven wrapper(fixes #1167) add 456edf1 [Dubbo-1284] Fix UT warning message when running on Java 9 (#1323) add 720dff8 Merge pull request #1319, add unit test for jetty http binder and tomcat http binder add d388735 [Dubbo-1283] Ensure we can build Dubbo on Java 9 (#1345) add d129f10 Collection.isEmpty() should be used to test for emptiness (#1315) add 61ba25b Merge pull request #1291, allow @Reference to support custom annotations add c56d192 Merge pull request #1249, channel.close() in netty4 is async, so reconnect() don't connected add 9c2e2fa add javadoc for setAttachments in order to clarify issue#1166 add 25dfe1c Merge pull request #912, reducing search times in selectForKey(hash) add 8b352ef update README add 16bac78 Merge pull request #1353, fix oninvoke injection failure add 2c20d99 fixed travis-ci failed because of test cases. (#1370) add a582764 Merge pull request #1377, remove redundant arguments for StatItem.isAllowable() add 59ca32a Merge branch '2.5.x' add fddedf6 Merge pull request #1378, replace StringBuider with simple string concatenation in log. add ddb677b Merge pull request #1375, remove unnecessary boxing. add ace2f4f Merge pull request #1331, add optional parameter to support hessian protocol method overload and request protocol version. add c7197b0 Merge pull request #1376, do not instantiate load balance if there is no invokers add c7170d5 Merge pull request #1384, fix build string bug. add b52879c Merge pull request #1040, refactor: replace some deprecated methods related with jedis. add 4bbc0dd Merge pull request #1242, remove redundant null check. add d8f3dd3 Change Mailing list address add 5d7b316 Fixed #1398, revert bugs introduced from #1375 add d7a78c3 Fix time unit problem in UT add d47d22b Fix time unit problem related with FutureAdapter in UT add 7faa3f0 Merge pull request #1391, fix typo of method name in qos module. add 84124c4 Merge branch '2.5.x' of https://github.com/alibaba/dubbo add 91f9250 fix number type is lost in yam
[incubator-dubbo] branch 2.5.x updated (6e38481 -> 4f34540)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. omit 6e38481 Merge remote-tracking branch 'upstream/2.5.x' into 2.5.11 omit 661ca74 Polish alibaba/dubbo #1317 omit a95b118 Polish alibaba/dubbo #1317 omit b5f7afe Merge remote-tracking branch 'origin/2.5.11' into 2.5.11 omit 51c29ba Test omit c2ae82a Polish alibaba/dubbo #1277 omit 8681ad7 Update version to be 2.5.11 omit 8a0ce5e Polish alibaba/dubbo #1464 omit bb4651e Merge upstream/2.5.x omit 3364f42 Merge remote-tracking branch 'upstream/2.5.x' into 2.5.11 omit 562ce4f Merge branch 'master' of https://github.com/mercyblitz/dubbo omit b9b1f15 Upgrade spring xsd version from 2.5 to 4.3 omit 5dd8ddc Fix typo (#1424) omit 6a5281e fix heartbeat spelling error (#1451) omit 1f22f56 Add unit test for ExtensionLoader omit 2308427 Add .script route rules back for UT omit c94198b Fix UT problems after structure change omit 4a5c5e2 Merge pull request #1389, refactor dubbo deployment process omit b626432 clean up imports for CacheTest omit d770d92 [Dubbo-#1362] cache provider always lru cache (#1396) omit 3d4f2fc Remove author info and add apache license omit 6dff137 Fix "promoteTransitiveDependencies=false" of maven-shade-plugin omit 0423219 #1411: Locale deserialize 'zh-hant_CN' omit 3be23d9 update README format omit 8bd9e9d update readme to add some details (#1403) omit 91f9250 fix number type is lost in yaml config file (#1401) omit 84124c4 Merge branch '2.5.x' of https://github.com/alibaba/dubbo omit 7faa3f0 Merge pull request #1391, fix typo of method name in qos module. omit d47d22b Fix time unit problem related with FutureAdapter in UT omit d7a78c3 Fix time unit problem in UT omit 5d7b316 Fixed #1398, revert bugs introduced from #1375 omit d8f3dd3 Change Mailing list address omit 4bbc0dd Merge pull request #1242, remove redundant null check. omit b52879c Merge pull request #1040, refactor: replace some deprecated methods related with jedis. omit c7170d5 Merge pull request #1384, fix build string bug. omit c7197b0 Merge pull request #1376, do not instantiate load balance if there is no invokers omit ace2f4f Merge pull request #1331, add optional parameter to support hessian protocol method overload and request protocol version. omit ddb677b Merge pull request #1375, remove unnecessary boxing. omit fddedf6 Merge pull request #1378, replace StringBuider with simple string concatenation in log. omit 59ca32a Merge branch '2.5.x' omit a582764 Merge pull request #1377, remove redundant arguments for StatItem.isAllowable() omit 2c20d99 fixed travis-ci failed because of test cases. (#1370) omit 16bac78 Merge pull request #1353, fix oninvoke injection failure omit 8b352ef update README omit 25dfe1c Merge pull request #912, reducing search times in selectForKey(hash) omit 9c2e2fa add javadoc for setAttachments in order to clarify issue#1166 omit c56d192 Merge pull request #1249, channel.close() in netty4 is async, so reconnect() don't connected omit 61ba25b Merge pull request #1291, allow @Reference to support custom annotations omit d129f10 Collection.isEmpty() should be used to test for emptiness (#1315) omit d388735 [Dubbo-1283] Ensure we can build Dubbo on Java 9 (#1345) omit 720dff8 Merge pull request #1319, add unit test for jetty http binder and tomcat http binder omit 456edf1 [Dubbo-1284] Fix UT warning message when running on Java 9 (#1323) omit 61d7178 Merge pull request #1333, remove unnecessary maven wrapper(fixes #1167) omit 98c548a add config for travis ci fail when test case fail (#1264) omit daac568 Remove slf4j-log4j12 dependency omit 9ca9bb0 Fix typo #1260 omit 2f7f91c Remove unnecessary transitive dependencies omit d1292c2 Add "source" configuration to JdkCompiler omit a4632da Merge branch '2.5.x' omit 5b0ab11 remove hot symbol omit 74f7074 add dubbo-ops link omit 2108d8f Update README.md omit 8eb0d6f Remove useless dependencies omit c7cd889 Merge pull request #1236, fix typo in FailbackRegistry. omit 09722e3 Remove unnecessary dependencies omit 9cb9426 Add comment omit 6160d3e Fixed #1226, enhance netty support for rest protocol omit 267292e Fixed #1186, change the default ZK client from `zkclient` to `curator` omit 77f03a5 add javadoc.opts to adapt java7 and java 8 omit 5c3c29b recover -Xdoclint:none temperary omit 4a5b189 Merge branch 'master' of https://github.com/alibaba/dubbo omit 8031ba6 获取Serializer和Deserializer时,高并发情况下线程block (#1196) omit 7cfa205 Merge pull request from #1170, fix typo of SUFFIXES. omit 926
[incubator-dubbo] branch 2.5.x updated (1e5b28f -> 4f34540)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. discard 1e5b28f Polish alibaba/dubbo#1306 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/2.5.x (4f34540) \ O -- O -- O (1e5b28f) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../AnnotationPropertyValuesAdapter.java | 92 .../DubboConfigBindingBeanPostProcessor.java | 115 +++ .../ReferenceAnnotationBeanPostProcessor.java | 161 - .../factory/annotation/ReferenceBeanBuilder.java | 26 +--- .../ServiceAnnotationBeanPostProcessor.java| 49 --- .../annotation/DubboConfigBindingRegistrar.java| 64 +--- .../properties/AbstractDubboConfigBinder.java | 69 - .../properties/DefaultDubboConfigBinder.java | 46 -- .../context/properties/DubboConfigBinder.java | 58 .../converter/StringArrayToMapConverter.java | 38 - .../converter/StringArrayToStringConverter.java| 37 - .../dubbo/config/spring/util/AnnotationUtils.java | 89 .../dubbo/config/spring/util/ObjectUtils.java | 37 - .../config/spring/util/PropertySourcesUtils.java | 18 +-- .../annotation/provider/AnnotationServiceImpl.java | 2 +- .../AnnotationPropertyValuesAdapterTest.java | 158 .../DubboConfigBindingBeanPostProcessorTest.java | 66 - .../ReferenceAnnotationBeanPostProcessorTest.java | 95 ++-- .../ServiceAnnotationBeanPostProcessorTest.java| 3 +- .../properties/DefaultDubboConfigBinderTest.java | 56 --- .../converter/StringArrayToMapConverterTest.java | 52 --- .../StringArrayToStringConverterTest.java | 46 -- 22 files changed, 136 insertions(+), 1241 deletions(-) delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/AbstractDubboConfigBinder.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinder.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DubboConfigBinder.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverter.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverter.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/AnnotationUtils.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/ObjectUtils.java delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo] branch 2.5.x updated: Polish alibaba/dubbo#1306
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.5.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/2.5.x by this push: new 1e5b28f Polish alibaba/dubbo#1306 1e5b28f is described below commit 1e5b28f458ee5bb9ea3cb656fc5932e1296b3ee4 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Fri Mar 30 23:33:37 2018 +0800 Polish alibaba/dubbo#1306 --- .../AnnotationPropertyValuesAdapter.java | 92 .../DubboConfigBindingBeanPostProcessor.java | 115 --- .../ReferenceAnnotationBeanPostProcessor.java | 161 + .../factory/annotation/ReferenceBeanBuilder.java | 26 +++- .../ServiceAnnotationBeanPostProcessor.java| 49 +++ .../annotation/DubboConfigBindingRegistrar.java| 64 +++- .../properties/AbstractDubboConfigBinder.java | 69 + .../properties/DefaultDubboConfigBinder.java | 46 ++ .../context/properties/DubboConfigBinder.java | 58 .../converter/StringArrayToMapConverter.java} | 75 +- .../converter/StringArrayToStringConverter.java} | 74 +- .../dubbo/config/spring/util/AnnotationUtils.java | 89 .../dubbo/config/spring/util/ObjectUtils.java} | 74 +- .../config/spring/util/PropertySourcesUtils.java | 18 ++- .../annotation/provider/AnnotationServiceImpl.java | 2 +- .../AnnotationPropertyValuesAdapterTest.java | 158 .../DubboConfigBindingBeanPostProcessorTest.java | 66 + .../ReferenceAnnotationBeanPostProcessorTest.java | 95 ++-- .../ServiceAnnotationBeanPostProcessorTest.java| 3 +- .../properties/DefaultDubboConfigBinderTest.java | 56 +++ .../converter/StringArrayToMapConverterTest.java} | 89 +++- .../StringArrayToStringConverterTest.java} | 83 ++- 22 files changed, 1241 insertions(+), 321 deletions(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java new file mode 100644 index 000..751399f --- /dev/null +++ b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java @@ -0,0 +1,92 @@ +/* + * 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 com.alibaba.dubbo.config.spring.beans.factory.annotation; + +import org.springframework.beans.MutablePropertyValues; +import org.springframework.beans.PropertyValue; +import org.springframework.beans.PropertyValues; +import org.springframework.core.env.PropertyResolver; + +import java.lang.annotation.Annotation; + +import static com.alibaba.dubbo.config.spring.util.AnnotationUtils.getAttributes; + +/** + * {@link Annotation} {@link PropertyValues} Adapter + * + * @see Annotation + * @see PropertyValues + * @since 2.5.11 + */ +class AnnotationPropertyValuesAdapter implements PropertyValues { + +private final Annotation annotation; + +private final PropertyResolver propertyResolver; + +private final boolean ignoreDefaultValue; + +private final PropertyValues delegate; + +public AnnotationPropertyValuesAdapter(Annotation annotation, PropertyResolver propertyResolver, boolean ignoreDefaultValue, String... ignoreAttributeNames) { +this.annotation = annotation; +this.propertyResolver = propertyResolver; +this.ignoreDefaultValue = ignoreDefaultValue; +this.delegate = adapt(annotation, ignoreDefaultValue, ignoreAttributeNames); +} + +public AnnotationPropertyValuesAdapter(Annotation annotation, PropertyResolver propertyResolver, String... ignoreAttributeNames) { +this(annotation, propertyResolver, true, ignoreAttributeNames); +} + +private PropertyValues adapt(Annotation annotation, boolean ignoreDefaultValue, String... ignoreAttributeNames) { +return
[incubator-dubbo-spring-boot-project] branch 0.1.1 updated: Polish #50
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1 by this push: new 9032ec7 Polish #50 9032ec7 is described below commit 9032ec78178a2adebde348019bc89a07501ba342 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Thu Mar 29 17:41:31 2018 +0800 Polish #50 --- README.md | 38 ++- README_CN.md | 292 + dubbo-spring-boot-actuator/README.md | 7 - .../{README.md => README_CN.md}| 98 --- .../boot/dubbo/actuate/endpoint/DubboEndpoint.java | 8 - .../controller/DemoConsumerController.java | 2 +- .../src/main/resources/application.properties | 3 + .../demo/provider/service/DefaultDemoService.java | 2 +- .../src/main/resources/application.properties | 3 + 9 files changed, 378 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 2b8af73..8b3fee4 100644 --- a/README.md +++ b/README.md @@ -23,14 +23,31 @@ For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot ## Integrate with Maven -You can introduce the latest `dubbo-spring-boot-starter` to your project by adding the following dependency to your pom.xml +You can introduce the latest `dubbo-spring-boot-project` to your project by adding the following dependency to your pom.xml ```xml - -com.alibaba.boot -dubbo-spring-boot-starter -0.1.1 - + + +... + + + +com.alibaba.boot +dubbo-spring-boot-starter +0.1.1 + + + + +com.alibaba.boot +dubbo-spring-boot-actuator +0.1.1 + + + ... + + ``` + If your project failed to resolve the dependency, try to add the following repository: ```xml @@ -82,7 +99,7 @@ Service Provider implements `DemoService` : ```java @Service( -version = "1.0.0", +version = "${demo.service.version}", application = "${dubbo.application.id}", protocol = "${dubbo.protocol.id}", registry = "${dubbo.registry.id}" @@ -123,6 +140,9 @@ spring.application.name = dubbo-provider-demo server.port = 9090 management.port = 9091 +# Service version +demo.service.version = 1.0.0 + # Base packages to scan Dubbo Components (e.g @Service , @Reference) dubbo.scan.basePackages = com.alibaba.boot.dubbo.demo.provider.service @@ -161,7 +181,7 @@ Service consumer requires Spring Beans to reference `DemoService` : @RestController public class DemoConsumerController { -@Reference(version = "1.0.0", +@Reference(version = "${demo.service.version}", application = "${dubbo.application.id}", url = "dubbo://localhost:12345") private DemoService demoService; @@ -201,6 +221,8 @@ spring.application.name = dubbo-consumer-demo server.port = 8080 management.port = 8081 +# Service version +demo.service.version = 1.0.0 # Dubbo Config properties ## ApplicationConfig Bean diff --git a/README_CN.md b/README_CN.md new file mode 100644 index 000..9cb439e --- /dev/null +++ b/README_CN.md @@ -0,0 +1,292 @@ +# Dubbo Spring Boot 工程 + +[Dubbo](https://github.com/alibaba/dubbo) Spring Boot 工程致力于简化 Dubbo RPC 框架在 +[Spring Boot](https://github.com/spring-projects/spring-boot/) 应用场景的开发。同时也整合了 Spring Boot 特性: + +* [自动装配](dubbo-spring-boot-autoconfigure) (比如: 注解驱动, 自动装配等). +* [Production-Ready](dubbo-spring-boot-actuator) (比如: 安全, 健康检查, 外部化配置等). + + + +> Dubbo *|ˈdʌbəʊ|* is a high-performance, java based [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call) framework open-sourced by Alibaba. As in many RPC systems, dubbo is based around the idea of defining a service, specifying the methods that can be called remotely with their parameters and return types. On the server side, the server implements this interface and runs a dubbo server to handle client calls. On the client side, the client has a stub that provides the same method [...] + + + +## 版本 + +从现在开始, `dubbo-spring-boot-project` 将在每个发布中发行两个版本 : + +* `0.2.x` 是支持 Spring Boot 2.x 的主要版本(推荐,长期维护) + +* `0.1.x` 是支持 Spring Boot 1.x 的维护版本(兼容,短期维护) + + +## Maven 整合 + +### 稳定版本 + +如果你希望使用稳定的 `dubbo-spring-boot-project`,您可以自行将以下 Maven 依赖添加到您的工程 pom.xml: + +```xml + + +... + + + +com.alibaba.boot +dubbo-spring-boot-starter +0.1.1 + + + + +com.alibaba.boot +dubbo-spring-boot-actuator +0.1.1 + + + ... + + +``` + + +### 开发版本 + +如果你需要尝试最新 `dubbo-spring-boot-project` 的特性,您可以自将[开发分支](tree/0.1.x) 手动 Maven install 到本地 Maven 仓库。 + + + +## 依赖关系 + +| 版本 | Java | Spring Boot | Dubbo | +| | - | ---
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Remove Web words
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 95de333 Remove Web words 95de333 is described below commit 95de333ddcf36d14b4b80f837dab148f24720580 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Thu Mar 29 20:02:07 2018 +0800 Remove Web words --- .../actuate/autoconfigure/DubboEndpointsAutoConfiguration.java| 4 ++-- ...poins-default.properties => dubbo-endpoins-default.properties} | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java index 8cb2961..038e0bf 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java +++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java @@ -34,8 +34,8 @@ import org.springframework.context.annotation.PropertySource; */ @Configuration @PropertySource( -name = "Dubbo Web Endpoints Default Properties", -value = "classpath:/META-INF/dubbo-web-endpoins-default.properties") +name = "Dubbo Endpoints Default Properties", +value = "classpath:/META-INF/dubbo-endpoins-default.properties") public class DubboEndpointsAutoConfiguration { @Bean diff --git a/dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-web-endpoins-default.properties b/dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoins-default.properties similarity index 87% rename from dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-web-endpoins-default.properties rename to dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoins-default.properties index af4fd40..97a012f 100644 --- a/dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-web-endpoins-default.properties +++ b/dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoins-default.properties @@ -1,10 +1,8 @@ -# Dubbo Web Endpoints Default Properties is loaded by @PropertySource with low order, +# Dubbo Endpoints Default Properties is loaded by @PropertySource with low order, # those values of properties can be override by higher PropertySource # @see DubboEndpointsAutoConfiguration -# "management.endpoints.web.base-path" should not be configured in this file - -# Set enabled for Dubbo Web Endpoints +# Set enabled for Dubbo Endpoints management.endpoint.dubbo.enabled = true management.endpoint.dubbo-shutdown.enabled = false management.endpoint.dubbo-configs.enabled = true @@ -12,6 +10,8 @@ management.endpoint.dubbo-services.enabled = false management.endpoint.dubbo-references.enabled = false management.endpoint.dubbo-properties.enabled = true +# "management.endpoints.web.base-path" should not be configured in this file + # Re-defines path-mapping of Dubbo Web Endpoints management.endpoints.web.path-mapping.dubbo-shutdown = dubbo/shutdown management.endpoints.web.path-mapping.dubbo-configs = dubbo/configs -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update Chinese document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new ca9454f Update Chinese document ca9454f is described below commit ca9454f666815e6979c1a6cf05f1cee23d30ba1f Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Thu Mar 29 20:12:07 2018 +0800 Update Chinese document --- README.md| 2 +- README_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 950b434..bc8ecde 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot * `0.2.x` is a main stream release version for Spring Boot 2.x -* `0.1.x` is a legacy version for maintaining Spring Boot 1.x +* [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) is a legacy version for maintaining Spring Boot 1.x diff --git a/README_CN.md b/README_CN.md index d586640..e14b00c 100644 --- a/README_CN.md +++ b/README_CN.md @@ -18,7 +18,7 @@ * `0.2.x` 是支持 Spring Boot 2.x 的主要版本(推荐,长期维护) -* [`0.1.x`](tree/0.1.x) 是支持 Spring Boot 1.x 的维护版本(兼容,短期维护) +* [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) 是支持 Spring Boot 1.x 的维护版本(兼容,短期维护) ## Maven 整合 -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.1 updated: Update Chinese document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1 by this push: new ec371a7 Update Chinese document ec371a7 is described below commit ec371a74dc6bb9b33b4fbde3698accb9c49af4b0 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Thu Mar 29 20:20:25 2018 +0800 Update Chinese document --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ce3da2..54890e9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ > Dubbo *|ˈdʌbəʊ|* is a high-performance, java based > [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call) framework > open-sourced by Alibaba. As in many RPC systems, dubbo is based around the > idea of defining a service, specifying the methods that can be called > remotely with their parameters and return types. On the server side, the > server implements this interface and runs a dubbo server to handle client > calls. On the client side, the client has a stub that provides the same > method [...] -## [中文文档](README.md) +## [中文文档](README_CN.md) ## Versions -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #84 from apache/0.1.1
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit f3ce414f518551dc3101985bc9fb7c6a36b0968b Merge: b303778 9032ec7 Author: Mercy <mercybl...@gmail.com> AuthorDate: Thu Mar 29 20:14:27 2018 +0800 Merge pull request #84 from apache/0.1.1 Polish #50 README.md | 38 ++- README_CN.md | 292 + dubbo-spring-boot-actuator/README.md | 7 - .../{README.md => README_CN.md}| 98 --- .../boot/dubbo/actuate/endpoint/DubboEndpoint.java | 8 - .../controller/DemoConsumerController.java | 2 +- .../src/main/resources/application.properties | 3 + .../demo/provider/service/DefaultDemoService.java | 2 +- .../src/main/resources/application.properties | 3 + 9 files changed, 378 insertions(+), 75 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.1 updated: Update Chinese document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1 by this push: new 347fbdf Update Chinese document 347fbdf is described below commit 347fbdfb0645b04fa4add44e0dc1f709cea728d2 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Thu Mar 29 20:17:35 2018 +0800 Update Chinese document --- README_CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index 9cb439e..9533235 100644 --- a/README_CN.md +++ b/README_CN.md @@ -54,7 +54,7 @@ ### 开发版本 -如果你需要尝试最新 `dubbo-spring-boot-project` 的特性,您可以自将[开发分支](tree/0.1.x) 手动 Maven install 到本地 Maven 仓库。 +如果你需要尝试最新 `dubbo-spring-boot-project` 的特性,您可以自将[开发分支](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) 手动 Maven install 到本地 Maven 仓库。 -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.1 updated: Update Chinese document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1 by this push: new c40229e Update Chinese document c40229e is described below commit c40229ebf918527ba37bece0a3b42f2449585b46 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Thu Mar 29 20:19:10 2018 +0800 Update Chinese document --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8b3fee4..0ce3da2 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ > Dubbo *|ˈdʌbəʊ|* is a high-performance, java based > [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call) framework > open-sourced by Alibaba. As in many RPC systems, dubbo is based around the > idea of defining a service, specifying the methods that can be called > remotely with their parameters and return types. On the server side, the > server implements this interface and runs a dubbo server to handle client > calls. On the client side, the client has a stub that provides the same > method [...] +## [中文文档](README.md) ## Versions -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.1 updated: Update the version and document
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1 by this push: new fb1ac37 Update the version and document fb1ac37 is described below commit fb1ac37f078963495095c1dee5a186eb423ed618 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Mon Mar 26 21:31:11 2018 +0800 Update the version and document --- README.md | 25 ++ dubbo-spring-boot-actuator/README.md | 2 +- dubbo-spring-boot-actuator/pom.xml | 2 +- dubbo-spring-boot-autoconfigure/README.md | 2 +- dubbo-spring-boot-autoconfigure/pom.xml| 2 +- dubbo-spring-boot-parent/pom.xml | 4 ++-- .../dubbo-spring-boot-sample-api/pom.xml | 2 +- .../dubbo-spring-boot-sample-consumer/pom.xml | 2 +- .../dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml| 2 +- 12 files changed, 33 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 70beda3..591aae8 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Dubbo Spring Boot Project -[Dubbo](https://github.com/alibaba/dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more , it aslo provides +[Dubbo](https://github.com/alibaba/dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it aslo provides -* [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g.annotation-driven, auto configuration, externalized configuration). -* [production-ready features](dubbo-spring-boot-actuator) (e.g.security, health checks, externalized configuration). +* [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g., annotation-driven, auto configuration, externalized configuration). +* [production-ready features](dubbo-spring-boot-actuator) (e.g., security, health checks, externalized configuration). @@ -11,16 +11,24 @@ +## Versions +For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot 2.x and 1.x once release : +* `0.2.x` is a main stream release version for Spring Boot 2.x + +* `0.1.x` is a legacy version for maintaining Spring Boot 1.x + + ## Integrate with Maven + You can introduce the latest `dubbo-spring-boot-starter` to your project by adding the following dependency to your pom.xml ```xml com.alibaba.boot dubbo-spring-boot-starter -0.1.0 +0.1.1 ``` If your project failed to resolve the dependency, try to add the following repository: @@ -41,6 +49,15 @@ If your project failed to resolve the dependency, try to add the following repos +## Dependencies + +| versions | Java | Spring Boot | Dubbo | +| | - | - | -- | +| `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | +| `0.1.1` | 1.7 + | `1.3.0.RELEASE` + | `2.5.11` + | + + + ## Getting Started If you don't know about Dubbo , please take a few minutes to learn http://dubbo.io/ . After that you could dive deep into dubbo [user guide](http://dubbo.io/books/dubbo-user-book-en/). diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index a33916b..39d8c41 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -21,7 +21,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad com.alibaba.boot dubbo-spring-boot-actuator -0.1.0 +0.1.1 ``` If your project failed to resolve the dependency, try to add the following repository: diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index a9c1c04..a73c7cf 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -5,7 +5,7 @@ dubbo-spring-boot-parent com.alibaba.boot -0.1.0 +0.1.1 ../dubbo-spring-boot-parent/pom.xml 4.0.0 diff --git a/dubbo-spring-boot-autoconfigure/README.md b/dubbo-spring-boot-autoconfigure/README.md index 651c74a..9490e7d 100644 --- a/dubbo-spring-boot-autoconfigure/README.md +++ b/dubbo-spring-boot-autoconfigure/README.md @@ -23,7 +23,7 @@ You can introduce the latest `dubbo-spring-boot-autoconfigure` to your project com.alibaba.boot dubbo-spring-boot-autoconfigure -0.1.0 +0.1.1 ``` diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml
[incubator-dubbo-spring-boot-project] branch 0.1.1 updated: Update Spring Boot dependencies to be 1.5.10.RELEASE
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.1 by this push: new 42b5b48 Update Spring Boot dependencies to be 1.5.10.RELEASE 42b5b48 is described below commit 42b5b480e978b67a5535d7ed5b6c1d2dcc152216 Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Mon Mar 26 21:57:27 2018 +0800 Update Spring Boot dependencies to be 1.5.10.RELEASE --- README.md | 2 +- .../com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java | 6 ++ .../boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java | 6 ++ .../alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java | 6 ++ .../autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 6 ++ .../autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java | 6 ++ .../event/OverrideDubboConfigApplicationListenerDisableTest.java| 6 ++ .../context/event/OverrideDubboConfigApplicationListenerTest.java | 6 ++ .../dubbo/context/event/WelcomeLogoApplicationListenerTest.java | 6 ++ dubbo-spring-boot-autoconfigure/src/test/resources/dubbo.properties | 5 + dubbo-spring-boot-parent/pom.xml| 2 +- 11 files changed, 23 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 591aae8..2b8af73 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ If your project failed to resolve the dependency, try to add the following repos | versions | Java | Spring Boot | Dubbo | | | - | - | -- | | `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | -| `0.1.1` | 1.7 + | `1.3.0.RELEASE` + | `2.5.11` + | +| `0.1.1` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java index 09cdd1a..a3161be 100644 --- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java @@ -21,8 +21,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Map; @@ -37,12 +36,11 @@ import static com.alibaba.dubbo.common.Version.getVersion; * @since 1.0.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration( +@SpringBootTest( classes = { DubboEndpoint.class } ) -@IntegrationTest public class DubboEndpointTest { diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java index 9b596fb..ae5d388 100644 --- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java @@ -23,8 +23,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -57,14 +56,13 @@ import java.util.SortedMap; "dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint.mvc" } ) -@SpringApplicationConfiguration( +@SpringBootTest( classes = { DubboAutoConfiguration.class, DubboEndpoint.class, DubboMvcEndpointTest.class } ) -@IntegrationTest public class DubboMvcEndpointTest { @Bean diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java index 66231d4..6d736f0 100644 --- a/d
[incubator-dubbo-spring-boot-project] branch 0.2.0 created (now f3b5bd4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. at f3b5bd4 Add branch 0.2.0 for Spring Boot 2.0.0 This branch includes the following new commits: new f3b5bd4 Add branch 0.2.0 for Spring Boot 2.0.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.