This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.1.x by this push: new 3df3c8e 1. Update Dubbo 2.6.2-SNAPSHOT 2. Fixed issues from test cases 3df3c8e is described below commit 3df3c8eb9b02fc8c50c813dba2200635062e0e5e Author: mercyblitz <mercybl...@gmail.com> AuthorDate: Tue May 8 21:45:19 2018 +0800 1. Update Dubbo 2.6.2-SNAPSHOT 2. Fixed issues from test cases --- README.md | 6 +++--- README_CN.md | 6 +++--- dubbo-spring-boot-actuator/README.md | 2 +- dubbo-spring-boot-actuator/README_CN.md | 4 ++-- dubbo-spring-boot-actuator/pom.xml | 2 +- .../alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java | 8 -------- .../boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java | 2 +- dubbo-spring-boot-autoconfigure/README.md | 2 +- dubbo-spring-boot-autoconfigure/pom.xml | 2 +- dubbo-spring-boot-parent/pom.xml | 4 ++-- dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml | 2 +- .../dubbo-spring-boot-sample-consumer/pom.xml | 2 +- .../dubbo-spring-boot-sample-provider/pom.xml | 2 +- dubbo-spring-boot-samples/pom.xml | 2 +- dubbo-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 21 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 0ce3da2..6395455 100644 --- a/README.md +++ b/README.md @@ -34,14 +34,14 @@ You can introduce the latest `dubbo-spring-boot-project` to your project by add <dependency> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-starter</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> </dependency> <!-- Production-Ready Features --> <dependency> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-actuator</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> </dependency> ... @@ -72,7 +72,7 @@ If your project failed to resolve the dependency, try to add the following repos | versions | Java | Spring Boot | Dubbo | | -------- | ----- | ----------------- | ---------- | | `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | -| `0.1.1` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | +| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | diff --git a/README_CN.md b/README_CN.md index 9533235..66ace58 100644 --- a/README_CN.md +++ b/README_CN.md @@ -36,14 +36,14 @@ <dependency> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-starter</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> </dependency> <!-- Production-Ready 特性 --> <dependency> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-actuator</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> </dependency> ... @@ -63,7 +63,7 @@ | 版本 | Java | Spring Boot | Dubbo | | -------- | ----- | ----------------- | ---------- | | `0.2.0` | 1.8 + | `2.0.0.RELEASE` + | `2.5.11` + | -| `0.1.1` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | +| `0.1.1-SNAPSHOT` | 1.7 + | `1.5.10.RELEASE` + | `2.5.11` + | diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 1a67d86..257d9f7 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -21,7 +21,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad <dependency> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-actuator</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> </dependency> ``` If your project failed to resolve the dependency, try to add the following repository: diff --git a/dubbo-spring-boot-actuator/README_CN.md b/dubbo-spring-boot-actuator/README_CN.md index 2e64003..8273780 100644 --- a/dubbo-spring-boot-actuator/README_CN.md +++ b/dubbo-spring-boot-actuator/README_CN.md @@ -31,14 +31,14 @@ <dependency> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-starter</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> </dependency> <!-- Production-Ready 特性 --> <dependency> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-actuator</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> </dependency> ... diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index a73c7cf..4722459 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>dubbo-spring-boot-parent</artifactId> <groupId>com.alibaba.boot</groupId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <relativePath>../dubbo-spring-boot-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java index a3161be..16eef99 100644 --- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java @@ -65,11 +65,9 @@ public class DubboEndpointTest { Map<String, String> versions = (Map<String, String>) metadata.get("versions"); Map<String, String> urls = (Map<String, String>) metadata.get("urls"); - Map<String, String> endpoints = (Map<String, String>) metadata.get("endpoints"); Assert.assertFalse(versions.isEmpty()); Assert.assertFalse(urls.isEmpty()); - Assert.assertFalse(endpoints.isEmpty()); Assert.assertEquals(getVersion(DubboUtils.class, "1.0.0"), versions.get("dubbo-spring-boot")); Assert.assertEquals(getVersion(), versions.get("dubbo")); @@ -80,12 +78,6 @@ public class DubboEndpointTest { Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project/issues", urls.get("issues")); Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project.git", urls.get("git")); - Assert.assertEquals("/shutdown", endpoints.get("shutdown")); - Assert.assertEquals("/configs", endpoints.get("configs")); - Assert.assertEquals("/services", endpoints.get("services")); - Assert.assertEquals("/references", endpoints.get("references")); - Assert.assertEquals("/properties", endpoints.get("properties")); - } diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java index ae5d388..26962cb 100644 --- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java @@ -134,7 +134,7 @@ public class DubboMvcEndpointTest { Assert.assertEquals(1, services.size()); - Map<String, Object> demoServiceMeta = services.get("serviceb...@com.alibaba.boot.dubbo.actuate.endpoint.mvc.DubboMvcEndpointTest$DemoService#dubboMvcEndpointTest.DefaultDemoService"); + Map<String, Object> demoServiceMeta = services.get("ServiceBean:dubboMvcEndpointTest.DefaultDemoService:com.alibaba.boot.dubbo.actuate.endpoint.mvc.DubboMvcEndpointTest$DemoService:1.0.0"); Assert.assertEquals("1.0.0", demoServiceMeta.get("version")); diff --git a/dubbo-spring-boot-autoconfigure/README.md b/dubbo-spring-boot-autoconfigure/README.md index 9490e7d..15aacb9 100644 --- a/dubbo-spring-boot-autoconfigure/README.md +++ b/dubbo-spring-boot-autoconfigure/README.md @@ -23,7 +23,7 @@ You can introduce the latest `dubbo-spring-boot-autoconfigure` to your project <dependency> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-autoconfigure</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> </dependency> ``` diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index 54e0a4d..a272c29 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-parent</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <relativePath>../dubbo-spring-boot-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 5894d5c..68ffc1a 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-project</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -21,7 +21,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <spring-boot.version>1.5.10.RELEASE</spring-boot.version> - <dubbo.version>2.5.11</dubbo.version> + <dubbo.version>2.6.2-SNAPSHOT</dubbo.version> <zkclient.version>0.2</zkclient.version> <zookeeper.version>3.4.9</zookeeper.version> <curator-framework.version>2.12.0</curator-framework.version> diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml index bfa59b7..cbc9735 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-samples</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml index c1b6594..3c3a578 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-samples</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml index 070e3dc..a7273f1 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-samples</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml index 44a40da..715f92a 100644 --- a/dubbo-spring-boot-samples/pom.xml +++ b/dubbo-spring-boot-samples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-parent</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <relativePath>../dubbo-spring-boot-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot-starter/pom.xml index f8a6f9c..7de71f9 100644 --- a/dubbo-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-parent</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <relativePath>../dubbo-spring-boot-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 4855c41..8e867dc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>com.alibaba.boot</groupId> <artifactId>dubbo-spring-boot-project</artifactId> - <version>0.1.1</version> + <version>0.1.1-SNAPSHOT</version> <packaging>pom</packaging> -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.