You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/09/12 12:19:25 UTC
[dubbo] branch 3.0 updated: test: Upgrade the version for UT in
dubbo-config-spring (#8759)
This is an automated email from the ASF dual-hosted git repository.
albumenj 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 8df4aa5 test: Upgrade the version for UT in dubbo-config-spring (#8759)
8df4aa5 is described below
commit 8df4aa56843f118a3d0e54922265d51c91a66f39
Author: Xiong, Pin <pi...@foxmail.com>
AuthorDate: Sun Sep 12 07:19:14 2021 -0500
test: Upgrade the version for UT in dubbo-config-spring (#8759)
* test: Upgrade the version for UT in dubbo-config-spring
1. Upgrade zookeeper to 3.6.0
2. Upgrade curator to 5.1.0
* fixes: Fix the typo
---
dubbo-config/dubbo-config-spring/pom.xml | 63 +++++++++++++++++++---
.../registrycenter/AbstractRegistryCenter.java | 2 +-
2 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
index 42be9f0..9c8e3ea 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -30,7 +30,10 @@
<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
<!-- Uncomment spring_version property to check Spring 4.x compatibility -->
<!-- <spring_version>4.3.30.RELEASE</spring_version> -->
+ <curator5_version>5.1.0</curator5_version>
+ <zookeeper_version>3.6.0</zookeeper_version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -158,6 +161,12 @@
<artifactId>dubbo-registry-zookeeper</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-remoting-zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -170,38 +179,78 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-remoting-zookeeper</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <!-- Nacos dependencies for testing -->
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-registry-nacos</artifactId>
+ <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-configcenter-nacos</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator5_version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.alibaba.nacos</groupId>
- <artifactId>nacos-client</artifactId>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>${curator5_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-x-discovery</artifactId>
+ <version>${curator5_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
+ <version>${curator5_version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+
+ <!-- Nacos dependencies for testing -->
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-nacos</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-configcenter-nacos</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.nacos</groupId>
+ <artifactId>nacos-client</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registrycenter/AbstractRegistryCenter.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registrycenter/AbstractRegistryCenter.java
index c4ae5ca..d373234 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registrycenter/AbstractRegistryCenter.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registrycenter/AbstractRegistryCenter.java
@@ -58,7 +58,7 @@ abstract class AbstractRegistryCenter implements RegistryCenter {
private static final int DEFAULT_TICK_TIME = 5 * 1000;
/**
- * The default value is 60.
+ * The default value is 200.
*/
private static final int DEFAULT_MAX_CLIENT_CNXNS = 200;