[incubator-dubbo-ops] branch master updated: bug fix in route add (#42)
This is an automated email from the ASF dual-hosted git repository. iluo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git The following commit(s) were added to refs/heads/master by this push: new aaf3ff8 bug fix in route add (#42) aaf3ff8 is described below commit aaf3ff8db5ca1415d824e689b15a0e90e4674e61 Author: min AuthorDate: Fri Jun 22 10:58:11 2018 +0800 bug fix in route add (#42) * bug fix in route add * change redirect address * remove dependency log4j config * remove main method --- dubbo-admin/pom.xml| 13 --- .../dubboadmin/web/mvc/RouterController.java | 40 +- .../web/mvc/governance/OverridesController.java| 18 +- .../web/mvc/governance/WeightsController.java | 14 dubbo-admin/src/main/resources/log4j.properties| 37 .../templates/governance/screen/weights/index.vm | 2 +- 6 files changed, 77 insertions(+), 47 deletions(-) diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml index 1ce9b29..8639254 100644 --- a/dubbo-admin/pom.xml +++ b/dubbo-admin/pom.xml @@ -36,19 +36,6 @@ test - - - - - - - - - - - - - com.alibaba.boot velocity-spring-boot-starter diff --git a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/RouterController.java b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/RouterController.java index 55527df..0c01951 100644 --- a/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/RouterController.java +++ b/dubbo-admin/src/main/java/com/alibaba/dubboadmin/web/mvc/RouterController.java @@ -20,7 +20,9 @@ package com.alibaba.dubboadmin.web.mvc; import java.lang.reflect.Method; import java.util.Map; +import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; import com.alibaba.dubboadmin.SpringUtil; @@ -214,28 +216,34 @@ public class RouterController { if (method.getName().equals(action)) { Class param = method.getParameterTypes()[0]; try { -Object value = param.newInstance(); -Method[] mms = param.getDeclaredMethods(); -for (Method m : mms) { -if (m.getName().toLowerCase().startsWith("set")) { -String methodName = m.getName(); -String key = methodName.substring(3).toLowerCase(); -String tmp = params.get(key); -Object obj = tmp; -if (tmp != null) { -Class t = m.getParameterTypes()[0]; -if (isPrimitive(t)) { -obj = convertPrimitive(t, tmp); +if (!param.isAssignableFrom(HttpServletRequest.class)) { +Object value = param.newInstance(); +Method[] mms = param.getDeclaredMethods(); +for (Method m : mms) { +if (m.getName().toLowerCase().startsWith("set")) { +String methodName = m.getName(); +String key = methodName.substring(3).toLowerCase(); +String tmp = params.get(key); +Object obj = tmp; +if (tmp != null) { +Class t = m.getParameterTypes()[0]; +if (isPrimitive(t)) { +obj = convertPrimitive(t, tmp); +} +m.invoke(value, obj); } -m.invoke(value, obj); -} +} } +return (String)method.invoke(controller, value, request, response, model); +} else { +return (String)method.invoke(controller, request, response, model);
[incubator-dubbo-ops] branch master updated: bug issues #45 dubbo-admin.xml配置问题 (#47)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git The following commit(s) were added to refs/heads/master by this push: new 79daef6 bug issues #45 dubbo-admin.xml配置问题 (#47) 79daef6 is described below commit 79daef651d89f651186377801d965636ce3994c6 Author: giraffe <756345...@qq.com> AuthorDate: Fri Jun 22 09:22:39 2018 +0800 bug issues #45 dubbo-admin.xml配置问题 (#47) --- dubbo-admin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml index 6d357eb..1ce9b29 100644 --- a/dubbo-admin/pom.xml +++ b/dubbo-admin/pom.xml @@ -64,7 +64,7 @@ com.alibaba dubbo -2.6.1 +2.6.2
[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] 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] 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 (#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.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.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] 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.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 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 */ @ConditionalOnProperty(name =
[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 ServiceAnnotationBeanPostProcessor} */