Polish : apache#226

mercyblitz · Dec 18, 2018 · 0a44ae0 · 0a44ae0
1 parent f55886d
commit 0a44ae0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
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
@@ -16,11 +16,12 @@
  */
 package com.alibaba.boot.dubbo.util;
 
+import org.springframework.core.env.ConfigurableEnvironment;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import org.springframework.core.env.ConfigurableEnvironment;
 
 /**
  * The utilities class for Dubbo
@@ -61,7 +62,7 @@ public abstract class DubboUtils {
      * <p>
      * The default value is empty set.
      */
-    public static final String BASE_PACKAGES_PROPERTY_NAME = DUBBO_SCAN_PREFIX + PROPERTY_NAME_SEPARATOR + "basePackages";
+    public static final String BASE_PACKAGES_PROPERTY_NAME = DUBBO_SCAN_PREFIX + PROPERTY_NAME_SEPARATOR + "base-packages";
 
     /**
      * The property name of multiple properties binding from externalized configuration

diff --git a/...-spring-boot-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json b/...-spring-boot-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -1090,8 +1090,8 @@
     },
     {
       "sourceType": "com.alibaba.boot.dubbo.autoconfigure.DubboScanProperties",
-      "name": "dubbo.scan.basePackages",
-      "description": "The basePackages to scan , the multiple-value is delimited by comma\n\n @see EnableDubbo#scanBasePackages()",
+      "name": "dubbo.scan.base-packages",
+      "description": "The base-packages to scan , the multiple-value is delimited by comma\n\n @see EnableDubbo#scanBasePackages()",
       "type": "java.util.Set<java.lang.String>"
     }
   ]

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
@@ -28,6 +28,10 @@
     <artifactId>dubbo-spring-boot-sample-consumer</artifactId>
     <name>Dubbo Spring Boot Sample : Consumer</name>
 
+    <properties>
+        <spring-boot.version>2.0.1.RELEASE</spring-boot.version>
+    </properties>
+
     <dependencies>
 
         <!-- Spring Boot dependencies -->

diff --git a/...-boot-samples/dubbo-spring-boot-sample-provider/src/main/resources/application.properties b/...-boot-samples/dubbo-spring-boot-sample-provider/src/main/resources/application.properties
@@ -7,7 +7,7 @@ server.port = 9090
 demo.service.version = 1.0.0
 
 # Base packages to scan Dubbo Component: @com.alibaba.dubbo.config.annotation.Service
-dubbo.scan.basePackages  = com.alibaba.boot.dubbo.demo.provider.service
+dubbo.scan.base-packages  = com.alibaba.boot.dubbo.demo.provider.service
 
 
 # Dubbo Config properties