You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2022/06/15 12:26:44 UTC
[incubator-shenyu] branch master updated: downgrade curator to ver 4.0.1 for bootstrap data sync (#3566)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new ae3ac31dd downgrade curator to ver 4.0.1 for bootstrap data sync (#3566)
ae3ac31dd is described below
commit ae3ac31ddb608c52b64086a50d5f9595bb3df033
Author: Han Gao <dh...@hotmail.com>
AuthorDate: Wed Jun 15 20:26:35 2022 +0800
downgrade curator to ver 4.0.1 for bootstrap data sync (#3566)
---
.../shenyu-sync-data-zookeeper/pom.xml | 19 +++++++++++++++++++
.../data/zookeeper/ZookeeperSyncDataServiceTest.java | 5 -----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/shenyu-sync-data-center/shenyu-sync-data-zookeeper/pom.xml b/shenyu-sync-data-center/shenyu-sync-data-zookeeper/pom.xml
index b375c2162..7cdc97b6b 100644
--- a/shenyu-sync-data-center/shenyu-sync-data-zookeeper/pom.xml
+++ b/shenyu-sync-data-center/shenyu-sync-data-zookeeper/pom.xml
@@ -25,6 +25,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-sync-data-zookeeper</artifactId>
+ <properties>
+ <curator.version>4.0.1</curator.version>
+ <zookeeper.version>3.5.5</zookeeper.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
@@ -35,15 +40,29 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
+ <version>${curator.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
diff --git a/shenyu-sync-data-center/shenyu-sync-data-zookeeper/src/test/java/org/apache/shenyu/sync/data/zookeeper/ZookeeperSyncDataServiceTest.java b/shenyu-sync-data-center/shenyu-sync-data-zookeeper/src/test/java/org/apache/shenyu/sync/data/zookeeper/ZookeeperSyncDataServiceTest.java
index 17b36a666..bd868d51a 100644
--- a/shenyu-sync-data-center/shenyu-sync-data-zookeeper/src/test/java/org/apache/shenyu/sync/data/zookeeper/ZookeeperSyncDataServiceTest.java
+++ b/shenyu-sync-data-center/shenyu-sync-data-zookeeper/src/test/java/org/apache/shenyu/sync/data/zookeeper/ZookeeperSyncDataServiceTest.java
@@ -32,8 +32,6 @@ import org.apache.zookeeper.CreateMode;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
import java.util.ArrayList;
import java.util.Collections;
@@ -42,9 +40,7 @@ import java.util.List;
import static junit.framework.TestCase.assertTrue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import static org.mockito.Mockito.mock;
-@ExtendWith(MockitoExtension.class)
public final class ZookeeperSyncDataServiceTest {
private static final String MOCK_PLUGIN_PARENT_PATH = "/shenyu/plugin";
@@ -83,7 +79,6 @@ public final class ZookeeperSyncDataServiceTest {
@BeforeEach
public void setUp() throws Exception {
- zkClient = mock(ZookeeperClient.class);
TestingServer server = new TestingServer();
ZookeeperConfig config = new ZookeeperConfig(server.getConnectString());
zkClient = new ZookeeperClient(config);