diff --git a/Roadmap-zh.md b/Roadmap-zh.md index 73559795c..0619c666e 100644 --- a/Roadmap-zh.md +++ b/Roadmap-zh.md @@ -6,7 +6,6 @@ Spring Cloud Alibaba 致力于提供分布式应用服务开发的一站式解 如果您对 Roadmap 有任何建议或想法，欢迎在 issues 中或者通过其他社区渠道向我们提出，一起讨论。 - ## 已包含的组件 **Sentinel** @@ -21,10 +20,6 @@ Spring Cloud Alibaba 致力于提供分布式应用服务开发的一站式解 Apache RocketMQ™ 基于 Java 的高性能、高吞吐量的分布式消息和流计算平台。 -**Dubbo** - -Apache Dubbo™ 是一款高性能 Java RPC 框架。 - **Seata** 阿里巴巴开源产品，一个易于使用的高性能微服务分布式事务解决方案。 diff --git a/Roadmap.md b/Roadmap.md index 7d1f41187..e599988f0 100644 --- a/Roadmap.md +++ b/Roadmap.md @@ -2,45 +2,47 @@ See the [中文文档](https://github.com/alibaba/spring-cloud-alibaba/blob/master/Roadmap-zh.md) for Chinese Roadmap. +Spring Cloud Alibaba provides a one-stop solution for distributed application development. It contains all the +components required to develop distributed applications, making it easy for you to develop your applications using +Spring Cloud. -Spring Cloud Alibaba provides a one-stop solution for distributed application development. It contains all the components required to develop distributed applications, making it easy for you to develop your applications using Spring Cloud. - -This project contains components from both open-source and commercialized Alibaba middleware products，but are not limited to them. +This project contains components from both open-source and commercialized Alibaba middleware products，but are not +limited to them. If you have any suggestions on our roadmap, feel free to submit issues or contact us via the other channels. - ## Components **Sentinel** -An open-source project of Alibaba, Sentinel takes "flow" as breakthrough point, and provides solutions in areas such as flow control, concurrency, circuit breaking, and load protection to protect service stability. +An open-source project of Alibaba, Sentinel takes "flow" as breakthrough point, and provides solutions in areas such as +flow control, concurrency, circuit breaking, and load protection to protect service stability. **Nacos** -An opensource project of Alibaba, an easy-to-use dynamic service discovery, configuration and service management platform for building cloud native applications. +An opensource project of Alibaba, an easy-to-use dynamic service discovery, configuration and service management +platform for building cloud native applications. **RocketMQ** Apache RocketMQ™ is an open source distributed messaging and streaming data platform. -**Dubbo** - -Apache Dubbo™ is a high-performance, Java based open source RPC framework. - **Seata** A distributed transaction solution with high performance and ease of use for microservices architecture. **Alibaba Cloud OSS** -Alibaba Cloud Object Storage Service, An encrypted and secure cloud storage service which stores, processes and accesses massive amounts of data from anywhere in the world. +Alibaba Cloud Object Storage Service, An encrypted and secure cloud storage service which stores, processes and accesses +massive amounts of data from anywhere in the world. **Alibaba Cloud Schedulerx** -A distributed task scheduling product developed by Alibaba Middleware team. It supports both periodical tasks and tasks to be triggered at specified time points. +A distributed task scheduling product developed by Alibaba Middleware team. It supports both periodical tasks and tasks +to be triggered at specified time points. **Alibaba Cloud SMS** -A messaging service that covers the globe, Alibaba SMS provides convenient, efficient, and intelligent communication capabilities that help businesses quickly contact their customers. +A messaging service that covers the globe, Alibaba SMS provides convenient, efficient, and intelligent communication +capabilities that help businesses quickly contact their customers. diff --git a/pom.xml b/pom.xml index fdd2a459b..fd1813362 100644 --- a/pom.xml +++ b/pom.xml @@ -85,8 +85,6 @@ Hoxton.SR12 - - 2.7.15 4.0.1 @@ -141,44 +139,6 @@ import - - - org.apache.dubbo - dubbo-dependencies-bom - ${dubbo.version} - pom - import - - - org.springframework - spring-framework-bom - - - - - - org.apache.dubbo - dubbo-spring-boot-starter - ${dubbo.version} - - - - org.apache.dubbo - dubbo-spring-boot-actuator - ${dubbo.version} - - - - org.apache.dubbo - dubbo - ${dubbo.version} - - - org.springframework - spring-context - - - org.apache.rocketmq rocketmq-client diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml index ddd26fb8d..2797a4ef5 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml @@ -48,6 +48,7 @@ log4j log4j + 1.2.16 diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml index 3f1d29fc0..c3aacab40 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml @@ -47,7 +47,8 @@ log4j log4j - + 1.2.16 +