Merge remote-tracking branch 'upstream/master'
diff --git a/.gitignore b/.gitignore
index 35e3ede..8f36fda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,7 @@
# system ignore
.DS_Store
-Thumbs.db
\ No newline at end of file
+Thumbs.db
+
+# Maven ignore
+.flattened-pom.xml
\ No newline at end of file
diff --git a/README.md b/README.md
index e7afdad..be16c26 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>0.2.1-SNAPSHOT</version>
+ <version>0.2.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
@@ -104,8 +104,8 @@
| versions | Java | Spring Boot | Dubbo |
| -------- | ----- | ----------- | ---------- |
-| `0.2.1` | 1.8+ | `2.1.x` | `2.6.2` + |
-| `0.1.1` | 1.7+ | `1.5.x` | `2.6.2` + |
+| `0.2.1` | 1.8+ | `2.1.x` | `2.6.5` + |
+| `0.1.1` | 1.7+ | `1.5.x` | `2.6.5` + |
@@ -238,9 +238,9 @@
Having trouble with Dubbo Spring Boot? We’d like to help!
-- If you are upgrading, read the [release notes](https://github.com/dubbo/dubbo-spring-boot-project/releases) for upgrade instructions and "new and noteworthy" features.
-- Ask a question - You can join [ours google groups](https://groups.google.com/group/dubbo), or subscribe [Dubbo User Mailling List](mailto:dubbo+subscribe@googlegroups.com).
-- Report bugs at [github.com/dubbo/dubbo-spring-boot-project/issues](https://github.com/dubbo/dubbo-spring-boot-project/issues).
+- If you are upgrading, read the [release notes](https://github.com/apache/incubator-dubbo-spring-boot-project/releases) for upgrade instructions and "new and noteworthy" features.
+- Ask a question - You can subscribe [Dubbo User Mailling List](mailto:dev-subscribe@dubbo.apache.org).
+- Report bugs at [issues](https://github.com/apache/incubator-dubbo-spring-boot-project/issues).
@@ -293,4 +293,4 @@
- [Externalized Configuration Samples](dubbo-spring-boot-samples/externalized-configuration-samples)
- [Registry Zookeeper Samples](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples)
- [Registry Nacos Samples](dubbo-spring-boot-samples/dubbo-registry-nacos-samples)
-- [Sample API](dubbo-spring-boot-samples/sample-api)
\ No newline at end of file
+- [Sample API](dubbo-spring-boot-samples/sample-api)
diff --git a/README_CN.md b/README_CN.md
index aa50001..bccd60c 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -23,24 +23,50 @@
您可以为您的工程引入最新 `dubbo-spring-boot-starter` 的发布，增加以下依赖到工程的 `pom.xml` 文件中：
```xml
-<dependency>
- <groupId>com.alibaba.boot</groupId>
- <artifactId>dubbo-spring-boot-starter</artifactId>
- <version>0.2.1</version>
-</dependency>
+<properties>
+ <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
+ <dubbo.version>2.6.5</dubbo.version>
+</properties>
+
+<dependencyManagement>
+ <dependencies>
+ <!-- Spring Boot -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Dubbo dependencies -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-dependencies-bom</artifactId>
+ <version>${dubbo.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+</dependencyManagement>
-<!-- Dubbo -->
-<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo</artifactId>
- <version>2.6.5</version>
-</dependency>
-<!-- Spring Context Extras -->
-<dependency>
- <groupId>com.alibaba.spring</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>1.0.2</version>
-</dependency>
+<dependencies>
+ <!-- Dubbo Spring Boot Starter -->
+ <dependency>
+ <groupId>com.alibaba.boot</groupId>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
+ <version>0.2.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>${dubbo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
+</dependencies>
```
如果您的工程遇到了依赖问题, 请尝试添加如下 Maven 参考到工程的 `pom.xml` 文件中：
@@ -78,10 +104,10 @@
### 依赖关系
-| 版本 | Java | Spring Boot | Dubbo |
-| -------- | ----- | ----------------- | ---------- |
-| `0.2.0` | 1.8+ | `2.0.x` | `2.6.2`+ |
-| `0.1.1` | 1.7+ | `1.5.x` | `2.6.2`+ |
+| versions | Java | Spring Boot | Dubbo |
+| -------- | ----- | ----------- | ---------- |
+| `0.2.1` | 1.8+ | `2.1.x` | `2.6.5` + |
+| `0.1.1` | 1.7+ | `1.5.x` | `2.6.5` + |
@@ -251,9 +277,9 @@
如果您在使用 Dubbo Spring Boot 中遇到任何问题或者有什么建议? 我们非常需要您的支持!
-- 如果您需要升级版本，请提前阅读[发布公告](https://github.com/dubbo/dubbo-spring-boot-project/releases)，了解最新的特性和问题修复。
-- 如果您遇到任何问题 ，您可以加入官方 [Google 讨论组](https://groups.google.com/group/dubbo) , 或者订阅 [Dubbo 用户邮件列表](mailto:dubbo+subscribe@googlegroups.com)。
-- 问题反馈，您可以在 [issues](https://github.com/dubbo/dubbo-spring-boot-project/issues) 提出您遇到的使用问题。
+- 如果您需要升级版本，请提前阅读[发布公告](https://github.com/apache/incubator-dubbo-spring-boot-project/releases)，了解最新的特性和问题修复。
+- 如果您遇到任何问题 ，您可以订阅 [Dubbo 用户邮件列表](mailto:mailto:dev-subscribe@dubbo.apache.org)。
+- 问题反馈，您可以在 [issues](https://github.com/apache/incubator-dubbo-spring-boot-project/issues) 提出您遇到的使用问题。
@@ -290,19 +316,10 @@
### [dubbo-spring-boot-samples](dubbo-spring-boot-samples)
-The samples project of Dubbo Spring Boot that includes two parts:
-[dubbo-spring-boot-samples](dubbo-spring-boot-samples) 为 Dubbo Spring Boot 示例工程，包括：
+示例工程包含以下项目:
-
-#### [Dubbo 服务提供方示例](dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider)
-
-Dubbo 服务将会通过 localhost 的 `12345` 端口暴露服务，并且提供 JMX Endpoints。
-
-
-#### [Dubbo 服务消费方示例](dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer)
-
-Dubbo 服务将被 Spring WebMVC `Controller` 消费，并且提供 JMX 以及 Web Endpoints 端口：
-
-* 示例 `Controller` : http://localhost:8080/sayHello?name=HelloWorld
-* [健康检查](dubbo-spring-boot-actuator#health-checks) : http://localhost:8081/actuator/health
-* [Dubbo Endpoints](dubbo-spring-boot-actuator#endpoints) : http://localhost:8081/actuator/dubbo
+- [自动装配示例](dubbo-spring-boot-samples/auto-configure-samples)
+- [外部化示例](dubbo-spring-boot-samples/externalized-configuration-samples)
+- [整合 Zookeeper 示例](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples)
+- [整合 Nacos 示例](dubbo-spring-boot-samples/dubbo-registry-nacos-samples)
+- [示例 API](dubbo-spring-boot-samples/sample-api)
diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml
index 644e5d2..8359cb9 100644
--- a/dubbo-spring-boot-actuator/pom.xml
+++ b/dubbo-spring-boot-actuator/pom.xml
@@ -59,9 +59,9 @@
<!-- Dubbo autoconfigure -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
diff --git a/dubbo-spring-boot-distribution/pom.xml b/dubbo-spring-boot-distribution/pom.xml
index 377375b..9f7e21f 100644
--- a/dubbo-spring-boot-distribution/pom.xml
+++ b/dubbo-spring-boot-distribution/pom.xml
@@ -34,21 +34,21 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-actuator</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml
index 1c1920f..ee6a6ff 100644
--- a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml
+++ b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -47,9 +47,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot.samples</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java
index d84b96e..c83754a 100644
--- a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java
+++ b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java
@@ -41,9 +41,7 @@
@Bean
public ApplicationRunner runner() {
- return args -> {
- logger.info(demoService.sayHello("mercyblitz"));
- };
+ return args -> logger.info(demoService.sayHello("mercyblitz"));
}
public static void main(String[] args) {
diff --git a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml
index 8d8e322..aee1aa9 100644
--- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml
+++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -48,9 +48,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot.samples</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
index 01dfccc..20fe666 100644
--- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
+++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
@@ -36,6 +36,7 @@
@Value("${dubbo.application.name}")
private String serviceName;
+ @Override
public String sayHello(String name) {
return String.format("[%s] : Hello, %s", serviceName, name);
}
diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml
index 2f11091..87d4af9 100644
--- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml
+++ b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
@@ -48,9 +48,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot.samples</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Netty -->
diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java
index 408fe5e..68b690f 100644
--- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java
+++ b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java
@@ -39,9 +39,7 @@
@Bean
public ApplicationRunner runner() {
- return args -> {
- logger.info(demoService.sayHello("mercyblitz"));
- };
+ return args -> logger.info(demoService.sayHello("mercyblitz"));
}
public static void main(String[] args) {
diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml
index 93740db..339a2e6 100644
--- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml
+++ b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
@@ -49,9 +49,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot.samples</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Netty -->
diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
index f1d9ae1..fcd3aa5 100644
--- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
+++ b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
@@ -36,6 +36,7 @@
@Value("${dubbo.application.name}")
private String serviceName;
+ @Override
public String sayHello(String name) {
return String.format("[%s] : Hello, %s", serviceName, name);
}
diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml
index 375c279..c51685c 100644
--- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml
+++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -47,9 +47,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot.samples</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java
index 1b7935b..e238028 100644
--- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java
+++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java
@@ -39,9 +39,7 @@
@Bean
public ApplicationRunner runner() {
- return args -> {
- logger.info(demoService.sayHello("mercyblitz"));
- };
+ return args -> logger.info(demoService.sayHello("mercyblitz"));
}
public static void main(String[] args) {
diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml
index fb46909..24088b9 100644
--- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml
+++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Dubbo -->
@@ -49,9 +49,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot.samples</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<!-- Zookeeper -->
diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
index f1d9ae1..fcd3aa5 100644
--- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
+++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
@@ -36,6 +36,7 @@
@Value("${dubbo.application.name}")
private String serviceName;
+ @Override
public String sayHello(String name) {
return String.format("[%s] : Hello, %s", serviceName, name);
}
diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml
index 413eb9b..97fb10a 100644
--- a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml
+++ b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -47,9 +47,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot.samples</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java
index 2eb78b4..2b3778d 100644
--- a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java
+++ b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java
@@ -39,9 +39,7 @@
@Bean
public ApplicationRunner runner() {
- return args -> {
- logger.info(demoService.sayHello("mercyblitz"));
- };
+ return args -> logger.info(demoService.sayHello("mercyblitz"));
}
public static void main(String[] args) {
diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml
index 4f90d8c..093787a 100644
--- a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml
+++ b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
<dependency>
@@ -48,9 +48,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>com.alibaba.boot.samples</groupId>
<artifactId>dubbo-spring-boot-sample-api</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
index f1d9ae1..fcd3aa5 100644
--- a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
+++ b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java
@@ -36,6 +36,7 @@
@Value("${dubbo.application.name}")
private String serviceName;
+ @Override
public String sayHello(String name) {
return String.format("[%s] : Hello, %s", serviceName, name);
}
diff --git a/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot-starter/pom.xml
index 2bd319a..92f5c7e 100644
--- a/dubbo-spring-boot-starter/pom.xml
+++ b/dubbo-spring-boot-starter/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
diff --git a/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides b/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index 5ea3fc3..0000000
--- a/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: dubbo-spring-boot-autoconfigure,dubbo
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0f1dd4f..a223d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
@@ -124,6 +125,33 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</profile>
