apache
diff --git a/‎DISCLAIMER
-1 b/‎DISCLAIMER
-1
diff --git a/‎NOTICE
+1-1 b/‎NOTICE
+1-1
diff --git a/‎README.md
+11-32 b/‎README.md
+11-32
diff --git a/‎README_CN.md
+9-9 b/‎README_CN.md
+9-9
diff --git a/‎dubbo-spring-boot-actuator/README.md
+6-6 b/‎dubbo-spring-boot-actuator/README.md
+6-6
diff --git a/‎dubbo-spring-boot-actuator/pom.xml
-7 b/‎dubbo-spring-boot-actuator/pom.xml
-7
diff --git a/‎dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointTest.java
+4-3 b/‎dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointTest.java
+4-3
diff --git a/‎dubbo-spring-boot-autoconfigure/README.md
+1-1 b/‎dubbo-spring-boot-autoconfigure/README.md
+1-1
diff --git a/‎dubbo-spring-boot-autoconfigure/pom.xml
+1-2 b/‎dubbo-spring-boot-autoconfigure/pom.xml
+1-2
diff --git a/‎dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java
+22-11 b/‎dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java
+22-11
diff --git a/‎dubbo-spring-boot-compatible/actuator/pom.xml
-7 b/‎dubbo-spring-boot-compatible/actuator/pom.xml
-7
diff --git a/‎dubbo-spring-boot-compatible/autoconfigure/pom.xml
-1 b/‎dubbo-spring-boot-compatible/autoconfigure/pom.xml
-1
diff --git a/‎dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
+15 b/‎dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
+15
diff --git a/‎dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java
+2 b/‎dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java
+2
@@ -1,4 +1,4 @@
-Apache Dubbo (incubating)
+Apache Dubbo
 Copyright 2018-2019 The Apache Software Foundation
 
 This product includes software developed at
 
@@ -1,15 +1,18 @@
 # Apache Dubbo Spring Boot Project 
 
 [![Build Status](https://travis-ci.org/apache/dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/dubbo-spring-boot-project) 
-[![codecov](https://codecov.io/gh/apache/dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/ubbo-spring-boot-project)
+[![codecov](https://codecov.io/gh/apache/dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/dubbo-spring-boot-project)
 ![license](https://img.shields.io/github/license/apache/dubbo-spring-boot-project.svg)
 
 [Apache Dubbo](https://github.com/apache/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 also provides 
+[![codecov](https://codecov.io/gh/apache/dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/ubbo-spring-boot-project)
+![license](https://img.shields.io/github/license/apache/dubbo-spring-boot-project.svg)
+
 
 * [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).
 
-> Apache Dubbo (incubating) |ˈdʌbəʊ| is a high-performance, light weight, java based RPC framework. Dubbo offers three key functionalities, which include interface based remote call, fault tolerance & load balancing, and automatic service registration & discovery.
+> Apache Dubbo  |ˈdʌbəʊ| is a high-performance, light weight, java based RPC framework. Dubbo offers three key functionalities, which include interface based remote call, fault tolerance & load balancing, and automatic service registration & discovery.
 
 ## [中文说明](README_CN.md)
 
@@ -19,8 +22,8 @@
 You can introduce the latest `dubbo-spring-boot-starter` to your project by adding the following dependency to your pom.xml
 ```xml
 <properties>
-    <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
-    <dubbo.version>2.7.1</dubbo.version>
+    <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
+    <dubbo.version>2.7.3</dubbo.version>
 </properties>
 
 <dependencyManagement>
@@ -42,26 +45,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
             <type>pom</type>
             <scope>import</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-            <version>${dubbo.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+      
     </dependencies>
 </dependencyManagement>
 
@@ -70,13 +54,8 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
     <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-starter</artifactId>
-        <version>2.7.1</version>
-    </dependency>
-    
-    <dependency>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo</artifactId>
-    </dependency>
+        <version>2.7.3</version>
+    </dependency>    
 </dependencies>
 ```
 
@@ -295,4 +274,4 @@ The samples project of Dubbo Spring Boot that includes:
 
 ## License
 
-Apache Dubbo spring boot project is under the Apache 2.0 license. See the [LICENSE](https://github.com/apache/incubator-dubbo-spring-boot-project/blob/master/LICENSE) file for details.
+Apache Dubbo spring boot project is under the Apache 2.0 license. See the [LICENSE](https://github.com/apache/dubbo-spring-boot-project/blob/master/LICENSE) file for details.
@@ -1,16 +1,16 @@
 # Dubbo Spring Boot 工程
 
-[![Build Status](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project) 
-[![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)
-![license](https://img.shields.io/github/license/apache/incubator-dubbo-spring-boot-project.svg)
+[![Build Status](https://travis-ci.org/apache/dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/dubbo-spring-boot-project) 
+[![codecov](https://codecov.io/gh/apache/dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/dubbo-spring-boot-project)
+![license](https://img.shields.io/github/license/apache/dubbo-spring-boot-project.svg)
 
 [Dubbo](https://dubbo.apache.org/zh-cn/index.html) Apache Dubbo™ 是一款高性能Java RPC框架。
 [Spring Boot](https://github.com/spring-projects/spring-boot/) 应用场景的开发。同时也整合了 Spring Boot 特性：
 
 * [自动装配](dubbo-spring-boot-autoconfigure) (比如： 注解驱动, 自动装配等).
 * [Production-Ready](dubbo-spring-boot-actuator) (比如： 安全, 健康检查, 外部化配置等).
 
-> Apache Dubbo |ˈdʌbəʊ| 是一款高性能、轻量级的开源Java RPC框架，它提供了三大核心能力：面向接口的远程方法调用，智能容错和负载均衡，以及服务自动注册和发现。
+> Apache Dubbo  |ˈdʌbəʊ| 是一款高性能、轻量级的开源Java RPC框架，它提供了三大核心能力：面向接口的远程方法调用，智能容错和负载均衡，以及服务自动注册和发现。
 
 
 ## [English README](README_CN.md)
@@ -22,7 +22,7 @@
 ```xml
 <properties>
     <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
-    <dubbo.version>2.7.1</dubbo.version>
+    <dubbo.version>2.7.3</dubbo.version>
 </properties>
 
 <dependencyManagement>
@@ -72,7 +72,7 @@
     <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-starter</artifactId>
-        <version>2.7.1</version>
+        <version>2.7.3</version>
     </dependency>
 
     <dependency>
@@ -104,8 +104,8 @@
 
 | Dubbo Spring Boot | Dubbo  | Spring Boot |
 | ----------------- | ------ | ----------- |
-| [0.2.1.RELEASE](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.2.x)     | 2.6.5+ | 2.x         |
-| [0.1.2.RELEASE](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x)     | 2.6.5+ | 1.x         |
+| [0.2.1.RELEASE](https://github.com/apache/dubbo-spring-boot-project/tree/0.2.x)     | 2.6.5+ | 2.x         |
+| [0.1.2.RELEASE](https://github.com/apache/dubbo-spring-boot-project/tree/0.1.x)     | 2.6.5+ | 1.x         |
 
 
 ### 源代码构建
@@ -295,5 +295,5 @@ Dubbo Spring Boot 示例工程包括:
 
 ## License
 
-Apache Dubbo spring boot project 基于Apache 2.0许可证开源，详细请参考[LICENSE](https://github.com/apache/incubator-dubbo-spring-boot-project/blob/master/LICENSE)。
+Apache Dubbo spring boot project 基于Apache 2.0许可证开源，详细请参考[LICENSE](https://github.com/apache/dubbo-spring-boot-project/blob/master/LICENSE)。
 
@@ -22,7 +22,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad
 <dependency>
     <groupId>org.apache.dubbo</groupId>
     <artifactId>dubbo-spring-boot-actuator</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.3</version>
 </dependency>
 ```
 
@@ -171,15 +171,15 @@ Actuator endpoint `dubbo` supports Actuator Endpoints :
 {
   "timestamp": 1516623290166,
   "versions": {
-    "dubbo-spring-boot": "2.7.1",
-    "dubbo": "2.7.1"
+    "dubbo-spring-boot": "2.7.3",
+    "dubbo": "2.7.3"
   },
   "urls": {
     "dubbo": "https://github.com/apache/incubator-dubbo/",
     "google-group": "[email protected]",
-    "github": "https://github.com/apache/incubator-dubbo-spring-boot-project",
-    "issues": "https://github.com/apache/incubator-dubbo-spring-boot-project/issues",
-    "git": "https://github.com/apache/incubator-dubbo-spring-boot-project.git"
+    "github": "https://github.com/apache/dubbo-spring-boot-project",
+    "issues": "https://github.com/apache/dubbo-spring-boot-project/issues",
+    "git": "https://github.com/apache/dubbo-spring-boot-project.git"
   }
 }
 ```
 
@@ -65,13 +65,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <!-- Dubbo -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
 
@@ -17,6 +17,7 @@
 package org.apache.dubbo.spring.boot.actuate.endpoint;
 
 import org.apache.dubbo.spring.boot.util.DubboUtils;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,9 +67,9 @@ public void testInvoke() {
 
         Assert.assertEquals("https://github.com/apache/incubator-dubbo", urls.get("dubbo"));
         Assert.assertEquals("[email protected]", 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"));
+        Assert.assertEquals("https://github.com/apache/dubbo-spring-boot-project", urls.get("github"));
+        Assert.assertEquals("https://github.com/apache/dubbo-spring-boot-project/issues", urls.get("issues"));
+        Assert.assertEquals("https://github.com/apache/dubbo-spring-boot-project.git", urls.get("git"));
 
     }
 
 
@@ -23,7 +23,7 @@ You can introduce the latest `dubbo-spring-boot-autoconfigure` to your project
 <dependency>
     <groupId>org.apache.dubbo</groupId>
     <artifactId>dubbo-spring-boot-autoconfigure</artifactId>
-    <version>2.7.1</version>
+    <version>2.7.3</version>
 </dependency>
 ```
 
 
@@ -54,11 +54,10 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- Dubbo -->
+      <!-- Dubbo -->
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
-            <optional>true</optional>
         </dependency>
 
         <!-- Test Dependencies -->
 
@@ -19,7 +19,7 @@
 import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
 import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor;
 import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.ObjectProvider;
@@ -32,10 +32,14 @@
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.ClassUtils;
 
+import java.util.Map;
 import java.util.Collection;
 
 import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME;
 import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * {@link DubboRelaxedBinding2AutoConfiguration} Test
@@ -65,22 +69,29 @@ public class DubboRelaxedBinding2AutoConfigurationTest {
     private Environment environment;
 
     @Autowired
-    private Collection<Environment> environments;
+    private PropertyResolver primaryPropertyResolver;
+
+    @Autowired
+    private Map<String, Environment> environments;
 
     @Test
     public void testBeans() {
-        Assert.assertTrue(ClassUtils.isAssignableValue(BinderDubboConfigBinder.class, dubboConfigBinder));
-        Assert.assertNotNull(serviceAnnotationBeanPostProcessor);
-        Assert.assertNotNull(serviceAnnotationBeanPostProcessor.getIfAvailable());
-        Assert.assertNotNull(referenceAnnotationBeanPostProcessor);
-        Assert.assertNotNull(referenceAnnotationBeanPostProcessor.getIfAvailable());
 
-        Assert.assertNotNull(environment);
-        Assert.assertNotNull(environments);
+        assertTrue(ClassUtils.isAssignableValue(BinderDubboConfigBinder.class, dubboConfigBinder));
+
+        assertNotNull(serviceAnnotationBeanPostProcessor);
+        assertNotNull(serviceAnnotationBeanPostProcessor.getIfAvailable());
+        assertNotNull(referenceAnnotationBeanPostProcessor);
+        assertNotNull(referenceAnnotationBeanPostProcessor.getIfAvailable());
+
+        assertNotNull(environment);
+        assertNotNull(primaryPropertyResolver);
+        assertNotNull(environments);
 
-        Assert.assertEquals(1, environments.size());
+        assertEquals(primaryPropertyResolver, environment);
+        assertEquals(2, environments.size());
 
-        Assert.assertTrue(environments.contains(environment));
+        assertTrue(environments.containsValue(environment));
     }
 
 }
@@ -64,13 +64,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <!-- Dubbo -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
 
@@ -57,7 +57,6 @@
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
-            <optional>true</optional>
         </dependency>
 
         <!-- Test Dependencies -->
 
@@ -23,6 +23,7 @@
 import org.apache.dubbo.config.spring.context.annotation.DubboConfigConfiguration;
 import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -32,6 +33,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertyResolver;
 
 import java.util.Set;
@@ -106,4 +109,16 @@ protected static class SingleDubboConfigConfiguration {
     protected static class MultipleDubboConfigConfiguration {
     }
 
+    /**
+     * Build a primary {@link PropertyResolver} bean to {@link Autowired @Autowired}
+     *
+     * @param environment {@link Environment}
+     * @return alias bean for {@link Environment}
+     * @since 2.7.3
+     */
+    @Bean
+    @Primary
+    public PropertyResolver primaryPropertyResolver(Environment environment) {
+        return environment;
+    }
 }
@@ -17,6 +17,7 @@
 package org.apache.dubbo.spring.boot.autoconfigure;
 
 import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -52,4 +53,5 @@ public PropertyResolver dubboScanBasePackagesPropertyResolver(Environment enviro
     public DubboConfigBinder relaxedDubboConfigBinder() {
         return new RelaxedDubboConfigBinder();
     }
+
 }
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Apache Dubbo (incubating)`
	`1`	`+Apache Dubbo`
`2`	`2`	`Copyright 2018-2019 The Apache Software Foundation`
`3`	`3`
`4`	`4`	`This product includes software developed at`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`package org.apache.dubbo.spring.boot.autoconfigure;`
`18`	`18`
`19`	`19`	`import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;`
	`20`	`+`
`20`	`21`	`import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;`
`21`	`22`	`import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;`
`22`	`23`	`import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;`
`@@ -52,4 +53,5 @@ public PropertyResolver dubboScanBasePackagesPropertyResolver(Environment enviro`
`52`	`53`	`public DubboConfigBinder relaxedDubboConfigBinder() {`
`53`	`54`	`return new RelaxedDubboConfigBinder();`
`54`	`55`	`}`
	`56`	`+`
`55`	`57`	`}`