You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by me...@apache.org on 2018/12/18 15:26:33 UTC
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: 0.1.x
(#332)
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 fa7405a 0.1.x (#332)
fa7405a is described below
commit fa7405a8be790a3b356f21448ddd9cdc9f2cdaa6
Author: 小马哥 <me...@gmail.com>
AuthorDate: Tue Dec 18 23:26:28 2018 +0800
0.1.x (#332)
* Bug fix on test case
* Polish apache/incubator-dubbo-spring-boot-project#327 & apache/incubator-dubbo-spring-boot-project#325
* Polish apache/incubator-dubbo-spring-boot-project#321
* Polish apache/incubator-dubbo-spring-boot-project#220 no program
* Switch Yaml file
* Update version to be 0.2.0
* Polish apache/incubator-dubbo-spring-boot-project#218
* Update Documents
* Fix the test case's bugs
* Fix plugins' issues
* Fix test-cases
* Fix test cases
* Fixes an issue on DubboMvcEndpoint
---
README.md | 2 +-
README_CN.md | 2 +-
dubbo-spring-boot-actuator/README.md | 2 +-
dubbo-spring-boot-actuator/README_CN.md | 2 +-
.../DubboMvcEndpointManagementContextConfiguration.java | 3 ++-
.../com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java | 2 +-
.../alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java | 10 +++++-----
.../boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java | 4 ++--
.../dubbo/context/event/WelcomeLogoApplicationListener.java | 6 +++---
.../src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java | 4 ++--
.../test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java | 6 +++---
dubbo-spring-boot-parent/pom.xml | 2 +-
12 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/README.md b/README.md
index 9400c1f..42af4d8 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ management.port = 9091
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
+dubbo.scan.base-packages = com.alibaba.boot.dubbo.demo.provider.service
# Dubbo Config properties
## ApplicationConfig Bean
diff --git a/README_CN.md b/README_CN.md
index ea8dfcf..2e87dbd 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -150,7 +150,7 @@ management.port = 9091
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
+dubbo.scan.base-packages = com.alibaba.boot.dubbo.demo.provider.service
# Dubbo Config properties
## ApplicationConfig Bean
diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md
index 2b61aa1..abcefe0 100644
--- a/dubbo-spring-boot-actuator/README.md
+++ b/dubbo-spring-boot-actuator/README.md
@@ -195,7 +195,7 @@ Actuator endpoint `dubbo` supports Spring Web MVC Endpoints :
"dubbo.protocol.port": "12345",
"dubbo.registry.address": "N/A",
"dubbo.registry.id": "my-registry",
- "dubbo.scan.basePackages": "com.alibaba.boot.dubbo.demo.provider.service"
+ "dubbo.scan.base-packages": "com.alibaba.boot.dubbo.demo.provider.service"
}
```
diff --git a/dubbo-spring-boot-actuator/README_CN.md b/dubbo-spring-boot-actuator/README_CN.md
index 9e6780d..408077d 100644
--- a/dubbo-spring-boot-actuator/README_CN.md
+++ b/dubbo-spring-boot-actuator/README_CN.md
@@ -200,7 +200,7 @@ Actuator endpoint `dubbo` supports Spring Web MVC Endpoints :
"dubbo.protocol.port": "12345",
"dubbo.registry.address": "N/A",
"dubbo.registry.id": "my-registry",
- "dubbo.scan.basePackages": "com.alibaba.boot.dubbo.demo.provider.service"
+ "dubbo.scan.base-packages": "com.alibaba.boot.dubbo.demo.provider.service"
}
```
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 5bbd1f8..2a079e9 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
@@ -23,6 +23,7 @@ import com.alibaba.dubbo.config.annotation.Service;
import org.springframework.boot.actuate.autoconfigure.ManagementContextConfiguration;
import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -41,10 +42,10 @@ import org.springframework.context.annotation.Bean;
public class DubboMvcEndpointManagementContextConfiguration {
@Bean
+ @ConditionalOnBean(DubboEndpoint.class)
@ConditionalOnMissingBean
public DubboMvcEndpoint dubboMvcEndpoint(DubboEndpoint dubboEndpoint) {
return new DubboMvcEndpoint(dubboEndpoint);
}
-
}
diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java
index d96821d..4b3199e 100644
--- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java
+++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java
@@ -64,7 +64,7 @@ public class DubboEndpoint extends AbstractEndpoint<Map<String, Object>> {
Map<String, String> urls = new LinkedHashMap<>();
urls.put("dubbo", DUBBO_GITHUB_URL);
- urls.put("google-group", DUBBO_GOOGLE_GROUP_URL);
+ urls.put("mailing-list", DUBBO_MAILING_LIST);
urls.put("github", DUBBO_SPRING_BOOT_GITHUB_URL);
urls.put("issues", DUBBO_SPRING_BOOT_ISSUES_URL);
urls.put("git", DUBBO_SPRING_BOOT_GIT_URL);
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 16eef99..1c5e4cf 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
@@ -72,11 +72,11 @@ public class DubboEndpointTest {
Assert.assertEquals(getVersion(DubboUtils.class, "1.0.0"), versions.get("dubbo-spring-boot"));
Assert.assertEquals(getVersion(), versions.get("dubbo"));
- Assert.assertEquals("https://github.com/alibaba/dubbo", urls.get("dubbo"));
- Assert.assertEquals("http://groups.google.com/group/dubbo", urls.get("google-group"));
- Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project", urls.get("github"));
- Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project/issues", urls.get("issues"));
- Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project.git", urls.get("git"));
+ Assert.assertEquals("https://github.com/apache/incubator-dubbo", urls.get("dubbo"));
+ Assert.assertEquals("dev@dubbo.incubator.apache.org", urls.get("mailing-list"));
+ Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project", urls.get("github"));
+ Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project/issues", urls.get("issues"));
+ Assert.assertEquals("https://github.com/apache/incubator-dubbo-spring-boot-project.git", urls.get("git"));
}
diff --git a/dubbo-spring-boot-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 7b242fa..e8e9c38 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
@@ -54,7 +54,7 @@ import java.util.SortedMap;
"dubbo.protocol.port=20880",
"dubbo.provider.id=my-provider",
"dubbo.provider.host=127.0.0.1",
- "dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint.mvc"
+ "dubbo.scan.base-packages=com.alibaba.boot.dubbo.actuate.endpoint.mvc"
}
)
@SpringBootTest(
@@ -166,7 +166,7 @@ public class DubboMvcEndpointTest {
Assert.assertEquals("20880", properties.get("dubbo.protocol.port"));
Assert.assertEquals("my-provider", properties.get("dubbo.provider.id"));
Assert.assertEquals("127.0.0.1", properties.get("dubbo.provider.host"));
- Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint.mvc", properties.get("dubbo.scan.basePackages"));
+ Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint.mvc", properties.get("dubbo.scan.base-packages"));
}
diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java
index ea2b802..de4d8c2 100644
--- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java
+++ b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java
@@ -26,7 +26,7 @@ import org.springframework.context.ApplicationListener;
import org.springframework.core.annotation.Order;
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GITHUB_URL;
-import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GOOGLE_GROUP_URL;
+import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_MAILING_LIST;
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL;
import static com.alibaba.boot.dubbo.util.DubboUtils.LINE_SEPARATOR;
@@ -74,8 +74,8 @@ public class WelcomeLogoApplicationListener implements ApplicationListener<Appli
.append(" :: Dubbo (v").append(Version.getVersion()).append(") : ")
.append(DUBBO_GITHUB_URL)
.append(LINE_SEPARATOR)
- .append(" :: Google group : ")
- .append(DUBBO_GOOGLE_GROUP_URL)
+ .append(" :: Mailing List : ")
+ .append(DUBBO_MAILING_LIST)
.append(LINE_SEPARATOR)
;
diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java
index eef055f..71fac05 100644
--- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java
+++ b/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java
@@ -110,9 +110,9 @@ public abstract class DubboUtils {
public static final String DUBBO_GITHUB_URL = "https://github.com/apache/incubator-dubbo";
/**
- * The google group URL of Dubbo
+ * The dubbo mailing List
*/
- public static final String DUBBO_GOOGLE_GROUP_URL = "dev@dubbo.incubator.apache.org";
+ public static final String DUBBO_MAILING_LIST = "dev@dubbo.incubator.apache.org";
/**
* Filters Dubbo Properties from {@link ConfigurableEnvironment}
diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java
index 4c557f5..40fd6bc 100644
--- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java
+++ b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java
@@ -27,7 +27,7 @@ import static com.alibaba.boot.dubbo.util.DubboUtils.DEFAULT_MULTIPLE_CONFIG_PRO
import static com.alibaba.boot.dubbo.util.DubboUtils.DEFAULT_OVERRIDE_CONFIG_PROPERTY_VALUE;
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_CONFIG_PREFIX;
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GITHUB_URL;
-import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GOOGLE_GROUP_URL;
+import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_MAILING_LIST;
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_PREFIX;
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SCAN_PREFIX;
import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL;
@@ -39,7 +39,7 @@ import static com.alibaba.boot.dubbo.util.DubboUtils.filterDubboProperties;
/**
* {@link DubboUtils} Test
- *
+ *Ø
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
* @see DubboUtils
* @since 1.0.0
@@ -67,7 +67,7 @@ public class DubboUtilsTest {
Assert.assertEquals("https://github.com/apache/incubator-dubbo", DUBBO_GITHUB_URL);
- Assert.assertEquals("dev@dubbo.incubator.apache.org", DUBBO_GOOGLE_GROUP_URL);
+ Assert.assertEquals("dev@dubbo.incubator.apache.org", DUBBO_MAILING_LIST);
Assert.assertFalse(DEFAULT_MULTIPLE_CONFIG_PROPERTY_VALUE);
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index 0e816c2..dae76a1 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -305,7 +305,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.8,)</version>
+ <version>[1.7,)</version>
</requireJavaVersion>
<requireProperty>
<property>project.name</property>