This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch dev-metadata in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 97a5825bbf7cda882124755dcf7b5518455800d7 Author: ken.lj <[email protected]> AuthorDate: Wed Oct 17 19:12:41 2018 +0800 Add test scope pom dependency --- dubbo-bom/pom.xml | 20 +++++++++++++++----- dubbo-cluster/pom.xml | 6 ++++++ dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 11 +++++++++++ dubbo-servicedata/dubbo-servicedata-api/pom.xml | 7 +++++++ .../servicedata/integration/ServiceStoreService.java | 4 ++-- 7 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dubbo-bom/pom.xml b/dubbo-bom/pom.xml index d3af58b..7968e93 100644 --- a/dubbo-bom/pom.xml +++ b/dubbo-bom/pom.xml @@ -95,11 +95,6 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.dubbo</groupId> <artifactId>dubbo-filter-cache</artifactId> <version>${project.version}</version> </dependency> @@ -308,6 +303,21 @@ <artifactId>dubbo-servicedata-redis</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-governance-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-governance-zookeeper</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-governance-apollo</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 01bcda1..864cbb4 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -43,5 +43,11 @@ <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> </dependency> + + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml index 4bda52a..e7e9a1e 100644 --- a/dubbo-demo/dubbo-demo-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-consumer/pom.xml @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-api</artifactId> + <artifactId>dubbo-governance-zookeeper</artifactId> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml index a7c5811..d1d9aa9 100644 --- a/dubbo-demo/dubbo-demo-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-provider/pom.xml @@ -61,7 +61,7 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-governance-api</artifactId> + <artifactId>dubbo-governance-zookeeper</artifactId> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index 417318b..e403d03 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -54,5 +54,16 @@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-recipes</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/dubbo-servicedata/dubbo-servicedata-api/pom.xml b/dubbo-servicedata/dubbo-servicedata-api/pom.xml index d0d9f0f..7d7736d 100644 --- a/dubbo-servicedata/dubbo-servicedata-api/pom.xml +++ b/dubbo-servicedata/dubbo-servicedata-api/pom.xml @@ -52,5 +52,12 @@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-remoting-zookeeper</artifactId> + <version>${project.parent.version}</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/dubbo-servicedata/dubbo-servicedata-api/src/main/java/org/apache/dubbo/servicedata/integration/ServiceStoreService.java b/dubbo-servicedata/dubbo-servicedata-api/src/main/java/org/apache/dubbo/servicedata/integration/ServiceStoreService.java index cc1d22a..d487423 100644 --- a/dubbo-servicedata/dubbo-servicedata-api/src/main/java/org/apache/dubbo/servicedata/integration/ServiceStoreService.java +++ b/dubbo-servicedata/dubbo-servicedata-api/src/main/java/org/apache/dubbo/servicedata/integration/ServiceStoreService.java @@ -32,7 +32,6 @@ import org.apache.dubbo.servicedata.metadata.builder.ServiceDescriptorBuilder; import org.apache.dubbo.servicedata.store.ServiceStore; import org.apache.dubbo.servicedata.store.ServiceStoreFactory; -import java.util.Calendar; import java.util.Date; import java.util.Random; import java.util.Set; @@ -127,7 +126,8 @@ public class ServiceStoreService { long calculateStartTime() { Date now = new Date(); long nowMill = now.getTime(); - long today0 = DateUtils.truncate(now, Calendar.DAY_OF_MONTH).getTime(); + // FIXME + long today0 = 0; long subtract = today0 + ONE_DAY_IN_MIll - nowMill; Random r = new Random(); return subtract + (FOUR_HOURS_IN_MIll / 2) + r.nextInt(FOUR_HOURS_IN_MIll);
