Merge branch 'master' into master
diff --git a/README.md b/README.md
index f59b98a..b4d458a 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,15 @@
```
+### Legacy Versions
+
+If you still use the legacy Dubbo whose version is less than 2.7.0, please use the following Spring Boot starters:
+
+| 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 |
+
### Build from Source
@@ -280,3 +289,8 @@
- [Auto-Configuaration Samples](dubbo-spring-boot-samples/auto-configure-samples)
- [Externalized Configuration Samples](dubbo-spring-boot-samples/externalized-configuration-samples)
- [Registry Zookeeper Samples](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples)
+
+
+## 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.
diff --git a/README_CN.md b/README_CN.md
index 9962457..e0d7d64 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -283,3 +283,9 @@
- [自动装配](dubbo-spring-boot-samples/auto-configure-samples)
- [外部化配置](dubbo-spring-boot-samples/externalized-configuration-samples)
- [Zookeeper 注册中心](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples)
+
+
+## License
+
+Apache Dubbo spring boot project 基于Apache 2.0许可证开源，详细请参考[LICENSE](https://github.com/apache/incubator-dubbo-spring-boot-project/blob/master/LICENSE)。
+
diff --git a/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java
index aa65366..3b1d9cf 100644
--- a/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java
+++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java
@@ -39,7 +39,7 @@
@Configuration
@PropertySource(
name = "Dubbo Endpoints Default Properties",
- value = "classpath:/META-INF/dubbo-endpoins-default.properties")
+ value = "classpath:/META-INF/dubbo-endpoints-default.properties")
public class DubboEndpointAnnotationAutoConfiguration {
@Bean
diff --git a/dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoins-default.properties b/dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoints-default.properties
similarity index 100%
rename from dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoins-default.properties
rename to dubbo-spring-boot-actuator/src/main/resources/META-INF/dubbo-endpoints-default.properties
diff --git a/pom.xml b/pom.xml
index 95f09ae..6180879 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
@@ -153,7 +153,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</profile>
