diff --git a/README.md b/README.md index cf088b96c..529dd9c2b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi ```xml 2.1.1.RELEASE - 2.6.5 + 2.7.0-SNAPSHT @@ -35,15 +35,35 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi pom import - - + + - com.alibaba + org.apache.dubbo dubbo-dependencies-bom ${dubbo.version} pom import + + + org.apache.dubbo + dubbo + ${dubbo.version} + + + org.springframework + spring + + + javax.servlet + servlet-api + + + log4j + log4j + + + @@ -52,16 +72,12 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi org.apache.dubbo dubbo-spring-boot-starter - 0.2.1-SNAPSHOT + 1.0.0-SNAPSHOT + com.alibaba dubbo - ${dubbo.version} - - - io.netty - netty-all ``` @@ -70,8 +86,9 @@ If your project failed to resolve the dependency, try to add the following repos ```xml - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots + apache.snapshots.https + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots false @@ -83,13 +100,6 @@ If your project failed to resolve the dependency, try to add the following repos ``` -## Developing Versions - -For now, `dubbo-spring-boot-starter` will separate two versions for Spring Boot 2.x and 1.x once release : - -* [`0.2.x`](https://github.com/apache/incubator-dubbo-spring-boot-project) is a main stream release version for Spring Boot 2.x - -* [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) is a legacy version for maintaining Spring Boot 1.x ### Build from Source @@ -100,13 +110,6 @@ If you'd like to attempt to experience latest features, you also can build from > Maven install = `mvn install` -### Dependencies - -| 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` + | - ## Getting Started diff --git a/README_CN.md b/README_CN.md index e8d53a235..467037b35 100644 --- a/README_CN.md +++ b/README_CN.md @@ -23,32 +23,75 @@ 您可以为您的工程引入最新 `dubbo-spring-boot-starter` 的发布,增加以下依赖到工程的 `pom.xml` 文件中: ```xml - - org.apache.dubbo - dubbo-spring-boot-starter - 0.2.1 - - - - - com.alibaba - dubbo - 2.6.5 - - - - com.alibaba.spring - spring-context-support - 1.0.2 - + + 2.1.1.RELEASE + 2.7.0-SNAPSHT + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + org.apache.dubbo + dubbo-dependencies-bom + ${dubbo.version} + pom + import + + + + org.apache.dubbo + dubbo + ${dubbo.version} + + + org.springframework + spring + + + javax.servlet + servlet-api + + + log4j + log4j + + + + + + + + + + org.apache.dubbo + dubbo-spring-boot-starter + 1.0.0-SNAPSHOT + + + + com.alibaba + dubbo + + ``` 如果您的工程遇到了依赖问题, 请尝试添加如下 Maven 参考到工程的 `pom.xml` 文件中: ```xml - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots + apache.snapshots.https + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots false @@ -60,13 +103,6 @@ ``` -## 开发版本 - -从现在开始, `dubbo-spring-boot-project` 将在每个发布中发行两个版本 : - -* [`0.2.x`](https://github.com/apache/incubator-dubbo-spring-boot-project) 是支持 Spring Boot 2.x 的主要版本(推荐,长期维护) - -* [`0.1.x`](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x) 是支持 Spring Boot 1.x 的维护版本(兼容,短期维护) ### 源代码构建 @@ -76,12 +112,6 @@ 1. Maven install 当前工程 > Maven install = `mvn install` -### 依赖关系 - -| 版本 | 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`+ | diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index b9441f98f..aff3cf072 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -69,7 +69,7 @@ import - + org.apache.dubbo dubbo-dependencies-bom @@ -78,7 +78,6 @@ import - org.apache.dubbo dubbo