From 0b7ada1837b1ca2ccb7fcd894468b3e86f2d3bb6 Mon Sep 17 00:00:00 2001 From: songxiaosheng Date: Thu, 25 Jan 2024 22:10:14 +0800 Subject: [PATCH] :arrow_up: opt dubbo version to 3.2.9 --- .../dubbo-configcenter-consul/pom.xml | 2 +- .../dubbo-configcenter-etcd/pom.xml | 4 ++-- .../dubbo-metadata-report-consul/pom.xml | 4 ++-- .../dubbo-metadata-report-etcd/pom.xml | 4 ++-- dubbo-registry-extensions/dubbo-registry-consul/pom.xml | 2 +- dubbo-registry-extensions/dubbo-registry-dns/pom.xml | 2 +- dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml | 4 ++-- dubbo-registry-extensions/dubbo-registry-redis/pom.xml | 4 ++-- .../org/apache/dubbo/registry/redis/RedisRegistryTest.java | 6 +++--- dubbo-registry-extensions/dubbo-registry-sofa/pom.xml | 2 +- dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml | 2 +- dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml | 4 ++-- dubbo-rpc-extensions/dubbo-rpc-http/pom.xml | 2 +- .../dubbo-serialization-avro-test/pom.xml | 2 +- .../dubbo-serialization-fastjson-test/pom.xml | 2 +- .../dubbo-serialization-fst-test/pom.xml | 2 +- .../dubbo-serialization-gson-test/pom.xml | 2 +- .../dubbo-serialization-kryo-test/pom.xml | 2 +- .../dubbo-serialization-protobuf-test/pom.xml | 2 +- .../dubbo-serialization-protostuff-test/pom.xml | 2 +- 24 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml b/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml index bf18367cc..9a0e08640 100644 --- a/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml +++ b/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml @@ -26,7 +26,7 @@ 4.0.0 dubbo-configcenter-consul - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml index 38511eaef..6183288e2 100644 --- a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml +++ b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml @@ -28,7 +28,7 @@ 4.0.0 dubbo-configcenter-etcd - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT jar ${project.artifactId} The etcd implementation of the config-center api @@ -68,7 +68,7 @@ org.apache.dubbo.extensions dubbo-remoting-etcd3 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml index d1cb758b5..6eb74357d 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml +++ b/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-metadata-report-consul @@ -39,7 +39,7 @@ org.apache.dubbo.extensions dubbo-configcenter-consul - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT com.ecwid.consul diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml index 8b2415ac7..a13071462 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml +++ b/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-metadata-report-etcd @@ -93,7 +93,7 @@ org.apache.dubbo.extensions dubbo-remoting-etcd3 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT io.etcd diff --git a/dubbo-registry-extensions/dubbo-registry-consul/pom.xml b/dubbo-registry-extensions/dubbo-registry-consul/pom.xml index cd38639c4..479a85475 100644 --- a/dubbo-registry-extensions/dubbo-registry-consul/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-consul/pom.xml @@ -25,7 +25,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-registry-consul diff --git a/dubbo-registry-extensions/dubbo-registry-dns/pom.xml b/dubbo-registry-extensions/dubbo-registry-dns/pom.xml index afa6592eb..6126b0e19 100644 --- a/dubbo-registry-extensions/dubbo-registry-dns/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-dns/pom.xml @@ -29,7 +29,7 @@ dubbo-registry-dns jar ${project.artifactId} - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT The DNS registry module of Dubbo project diff --git a/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml b/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml index 2aefc9898..3b12510ca 100644 --- a/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml @@ -25,7 +25,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-registry-etcd3 jar ${project.artifactId} @@ -56,7 +56,7 @@ org.apache.dubbo.extensions dubbo-remoting-etcd3 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/dubbo-registry-extensions/dubbo-registry-redis/pom.xml b/dubbo-registry-extensions/dubbo-registry-redis/pom.xml index d7095b8a7..be64c0c50 100644 --- a/dubbo-registry-extensions/dubbo-registry-redis/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-redis/pom.xml @@ -23,7 +23,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-registry-redis jar ${project.artifactId} @@ -41,7 +41,7 @@ org.apache.dubbo.extensions dubbo-remoting-redis - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT redis.clients diff --git a/dubbo-registry-extensions/dubbo-registry-redis/src/test/java/org/apache/dubbo/registry/redis/RedisRegistryTest.java b/dubbo-registry-extensions/dubbo-registry-redis/src/test/java/org/apache/dubbo/registry/redis/RedisRegistryTest.java index 303971d24..30ff65da6 100644 --- a/dubbo-registry-extensions/dubbo-registry-redis/src/test/java/org/apache/dubbo/registry/redis/RedisRegistryTest.java +++ b/dubbo-registry-extensions/dubbo-registry-redis/src/test/java/org/apache/dubbo/registry/redis/RedisRegistryTest.java @@ -16,18 +16,18 @@ */ package org.apache.dubbo.registry.redis; +import org.apache.commons.lang3.SystemUtils; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.NetUtils; import org.apache.dubbo.registry.NotifyListener; import org.apache.dubbo.registry.Registry; import org.apache.dubbo.registry.support.AbstractRegistry; - -import org.apache.commons.lang3.SystemUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisConnectionException; +import redis.clients.jedis.exceptions.JedisExhaustedPoolException; import redis.embedded.RedisServer; import java.io.IOException; @@ -240,7 +240,7 @@ public void testAvailableWithBackup() { Registry registry = new RedisRegistryFactory().createRegistry(url); Registry finalRegistry = registry; - assertThrows(JedisConnectionException.class, () -> finalRegistry.isAvailable()); + assertThrows(JedisExhaustedPoolException.class, () -> finalRegistry.isAvailable()); url = URL.valueOf(this.registryUrl.toFullString()).addParameter(BACKUP_KEY, "redisTwo:8881"); registry = new RedisRegistryFactory().createRegistry(url); diff --git a/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml b/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml index b6fc1788f..d5bea295b 100644 --- a/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml @@ -24,7 +24,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-registry-sofa ${project.artifactId} The SOFARegistry module of Dubbo project diff --git a/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml index ea6007993..3138b28ee 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-remoting-etcd3 jar ${project.artifactId} diff --git a/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml index 4d0dc517f..95b7ba3b5 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml @@ -23,7 +23,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-remoting-grizzly jar ${project.artifactId} diff --git a/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml index de20a9421..f880e96d3 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml @@ -23,7 +23,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-remoting-mina jar ${project.artifactId} diff --git a/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml index 8961e35fc..9350d9a13 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml @@ -23,7 +23,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-remoting-p2p jar ${project.artifactId} diff --git a/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml index f8c982b3b..3702ce886 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml @@ -23,7 +23,7 @@ 4.0.0 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT dubbo-remoting-redis jar diff --git a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml index b37c0d290..34299488f 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml @@ -24,7 +24,7 @@ 4.0.0 dubbo-rpc-hessian - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT jar ${project.artifactId} @@ -64,7 +64,7 @@ org.apache.dubbo.extensions dubbo-serialization-native-hession - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT org.springframework diff --git a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml index 2aa4ca317..25d015dfe 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml @@ -26,7 +26,7 @@ 4.0.0 dubbo-rpc-http - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT The JSON-RPC module of dubbo project diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml index 7ea494106..6e0747a7e 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml @@ -31,7 +31,7 @@ 3.0.4 4.13.1 4.3.30.RELEASE - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT 3.7.0 diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml index cf8abd84e..52ce829fe 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml @@ -32,7 +32,7 @@ 3.2.7 4.13.1 4.3.30.RELEASE - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT 3.7.0 diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml index 77b295770..08d6d42b2 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml @@ -32,7 +32,7 @@ 3.0.4 4.13.1 4.3.30.RELEASE - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT 3.7.0 diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml index 069e982fe..64a47c093 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml @@ -32,7 +32,7 @@ 3.0.4 4.13.1 4.3.30.RELEASE - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT 3.7.0 diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml index c9a4ea325..c88c12f72 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml @@ -33,7 +33,7 @@ 4.13.1 4.3.30.RELEASE 1.0.5-SNAPSHOT - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT 3.7.0 diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml index 2c14f1fc5..7211511c5 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml @@ -33,7 +33,7 @@ 4.13.1 4.3.30.RELEASE 0.0.2 - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT 3.7.0 diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml index e5fc1351e..8f16f7033 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml @@ -32,7 +32,7 @@ 3.0.4 4.13.1 4.3.30.RELEASE - 1.0.2-SNAPSHOT + 3.2.0-SNAPSHOT 3.7.0