You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2022/01/14 05:43:55 UTC
[dubbo] branch 3.0 updated: add test dependency (#9570)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 485aeb9 add test dependency (#9570)
485aeb9 is described below
commit 485aeb9058270081fef7ec6c24e8e27f7806c2c5
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Jan 14 13:43:19 2022 +0800
add test dependency (#9570)
---
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 7 +++++++
.../remoting/zookeeper/curator/Curator5ZookeeperClientTest.java | 3 +++
.../zookeeper/curator/Curator5ZookeeperTransporterTest.java | 3 +++
dubbo-test/dubbo-test-check/pom.xml | 2 +-
5 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index dbf6885..24d574f 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -761,7 +761,7 @@
<profile>
<id>curator5</id>
<activation>
- <jdk>1.17</jdk>
+ <jdk>[17,)</jdk>
</activation>
<properties>
<zookeeper_version>3.7.0</zookeeper_version>
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
index 6b587a2..b73242f 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
@@ -62,5 +62,12 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-test-common</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/Curator5ZookeeperClientTest.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/Curator5ZookeeperClientTest.java
index 81463df..96c5cc8 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/Curator5ZookeeperClientTest.java
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/Curator5ZookeeperClientTest.java
@@ -28,6 +28,8 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
import java.util.List;
import java.util.concurrent.CountDownLatch;
@@ -39,6 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
+@DisabledForJreRange(min = JRE.JAVA_16)
public class Curator5ZookeeperClientTest {
private static Curator5ZookeeperClient curatorClient;
private static CuratorFramework client = null;
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/Curator5ZookeeperTransporterTest.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/Curator5ZookeeperTransporterTest.java
index 7454b0a..ca201d0 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/Curator5ZookeeperTransporterTest.java
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/Curator5ZookeeperTransporterTest.java
@@ -22,11 +22,14 @@ import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsNot.not;
import static org.hamcrest.core.IsNull.nullValue;
+@DisabledForJreRange(min = JRE.JAVA_16)
public class Curator5ZookeeperTransporterTest {
private ZookeeperClient zookeeperClient;
private Curator5ZookeeperTransporter curatorZookeeperTransporter;
diff --git a/dubbo-test/dubbo-test-check/pom.xml b/dubbo-test/dubbo-test-check/pom.xml
index ff78b0c..87f54a5 100644
--- a/dubbo-test/dubbo-test-check/pom.xml
+++ b/dubbo-test/dubbo-test-check/pom.xml
@@ -89,7 +89,7 @@
<profile>
<id>curator5</id>
<activation>
- <jdk>[1.17,)</jdk>
+ <jdk>[17,</jdk>
</activation>
<properties>
<curator.test.version>5.1.0</curator.test.version>