From 5f549c553a17e0b4c219c204eba77d8ff0f4c4bb Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Wed, 10 Jul 2019 19:03:29 +0800 Subject: [PATCH] #734 -> fix circleci build error --- .../README_CN.md | 34 +++++++++---------- .../dubbo-spring-cloud-client-sample/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../dubbo-spring-cloud-server-sample/pom.xml | 2 +- .../pom.xml | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md index e8c54e78..2c2a7746 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md +++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md @@ -15,7 +15,7 @@ public interface EchoService { ``` 为了确保契约的一致性，推荐的做法是将 Dubbo 服务接口打包在第二方或者第三方的 artifact（jar）中，如以上接口就存放在 - artifact [spring-cloud-dubbo-sample-api](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/tree/master/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api) 之中。 + artifact [dubbo-spring-cloud-sample-api](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/tree/master/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api) 之中。 对于服务提供方而言，不仅通过依赖 artifact 的形式引入 Dubbo 服务接口，而且需要将其实现。对应的服务消费端，同样地需要依赖该 artifact， 并以接口调用的方式执行远程方法。接下来进一步讨论怎样实现 Dubbo 服务提供方和消费方。 @@ -33,8 +33,8 @@ Dubbo Spring Cloud 必要的依赖： - org.springframework.cloud - spring-cloud-dubbo-sample-api + com.alibaba.cloud + dubbo-spring-cloud-sample-api ${project.version} @@ -46,24 +46,24 @@ Dubbo Spring Cloud 必要的依赖： - org.springframework.cloud - spring-cloud-starter-dubbo + com.alibaba.cloud + dubbo-spring-cloud-starter - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter ``` 以上依赖 artifact 说明如下： -- `spring-cloud-dubbo-sample-api` : 提供 `EchoService` 接口的 artifact +- `dubbo-spring-cloud-sample-api` : 提供 `EchoService` 接口的 artifact - `spring-boot-actuator` : Spring Boot Production-Ready artifact，间接引入 `spring-boot` artifact -- `spring-cloud-starter-dubbo` : Dubbo Spring Cloud Starter `artifact`，间接引入 `dubbo-spring-boot-starter` 等 artifact -- `spring-cloud-starter-alibaba-nacos-discovery` : Nacos Spring Cloud 服务注册与发现 `artifact` +- `dubbo-spring-cloud-starter` : Dubbo Spring Cloud Starter `artifact`，间接引入 `dubbo-spring-boot-starter` 等 artifact +- `alibaba-nacos-discovery-spring-cloud-starter` : Nacos Spring Cloud 服务注册与发现 `artifact` 值得注意的是，以上 artifact 未指定版本(version)，因此，还需显示地声明 `` : @@ -216,8 +216,8 @@ public class DubboSpringCloudServerBootstrap { - org.springframework.cloud - spring-cloud-dubbo-sample-api + com.alibaba.cloud + dubbo-spring-cloud-sample-api ${project.version} @@ -234,14 +234,14 @@ public class DubboSpringCloudServerBootstrap { - org.springframework.cloud - spring-cloud-starter-dubbo + com.alibaba.cloud + dubbo-spring-cloud-starter - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter ``` @@ -341,7 +341,7 @@ HTTP 响应为： ## 模块说明 -- [spring-cloud-dubbo-sample-api](spring-cloud-dubbo-sample-api)：API 模块，存放 Dubbo 服务接口和模型定义 +- [dubbo-spring-cloud-sample-api](dubbo-spring-cloud-sample-api)：API 模块，存放 Dubbo 服务接口和模型定义 - [spring-cloud-dubbo-provider-web-sample](spring-cloud-dubbo-provider-web-sample)：Dubbo Spring Cloud 服务提供方示例（Web 应用） - [spring-cloud-dubbo-provider-sample](spring-cloud-dubbo-provider-sample)：Dubbo Spring Cloud 服务提供方示例（非 Web 应用） - [spring-cloud-dubbo-consumer-sample](spring-cloud-dubbo-consumer-sample)：Dubbo Spring Cloud 服务消费方示例 diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml index e456f5e6..3f65c152 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml +++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml @@ -32,7 +32,7 @@ com.alibaba.cloud - spring-cloud-dubbo-sample-api + dubbo-spring-cloud-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml index 6b406a49..dd7f17ed 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml +++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml @@ -41,7 +41,7 @@ com.alibaba.cloud - spring-cloud-dubbo-sample-api + dubbo-spring-cloud-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml index f398b5f8..5800ae14 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml +++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml @@ -38,7 +38,7 @@ com.alibaba.cloud - spring-cloud-dubbo-sample-api + dubbo-spring-cloud-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml index a3ddf461..9fef98f3 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml +++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml @@ -30,7 +30,7 @@ com.alibaba.cloud - spring-cloud-dubbo-sample-api + dubbo-spring-cloud-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml index 1d2fdeaf..92b15bb9 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml +++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml @@ -34,7 +34,7 @@ com.alibaba.cloud - spring-cloud-dubbo-sample-api + dubbo-spring-cloud-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml index 5f596cb0..874fdfe0 100644 --- a/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml +++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml @@ -24,7 +24,7 @@ com.alibaba.cloud - spring-cloud-dubbo-sample-api + dubbo-spring-cloud-sample-api ${project.version}