⬆️ opt dubbo version to 3.2.9

songxiaosheng · Jan 25, 2024 · 0b7ada1 · 0b7ada1
1 parent 393d315
commit 0b7ada1
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 32 deletions.
diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml b/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dubbo-configcenter-consul</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dubbo-configcenter-etcd</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>The etcd implementation of the config-center api</description>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-remoting-etcd3</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

diff --git 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 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <artifactId>dubbo-metadata-report-consul</artifactId>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-configcenter-consul</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.ecwid.consul</groupId>

diff --git 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 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <artifactId>dubbo-metadata-report-etcd</artifactId>
 
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-remoting-etcd3</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.etcd</groupId>

diff --git a/dubbo-registry-extensions/dubbo-registry-consul/pom.xml b/dubbo-registry-extensions/dubbo-registry-consul/pom.xml
@@ -25,7 +25,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-registry-consul</artifactId>
 
     <properties>

diff --git a/dubbo-registry-extensions/dubbo-registry-dns/pom.xml b/dubbo-registry-extensions/dubbo-registry-dns/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>dubbo-registry-dns</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <description>The DNS registry module of Dubbo project</description>
 
     <dependencies>

diff --git a/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml b/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml
@@ -25,7 +25,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-registry-etcd3</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-remoting-etcd3</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/dubbo-registry-extensions/dubbo-registry-redis/pom.xml b/dubbo-registry-extensions/dubbo-registry-redis/pom.xml
@@ -23,7 +23,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-registry-redis</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-remoting-redis</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>

diff --git a/...dubbo-registry-redis/src/test/java/org/apache/dubbo/registry/redis/RedisRegistryTest.java b/...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
@@ -24,7 +24,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-registry-sofa</artifactId>
     <name>${project.artifactId}</name>
     <description>The SOFARegistry module of Dubbo project</description>

diff --git a/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-remoting-etcd3</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>

diff --git a/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml
@@ -23,7 +23,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-remoting-grizzly</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>

diff --git a/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml
@@ -23,7 +23,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-remoting-mina</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>

diff --git a/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml
@@ -23,7 +23,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-remoting-p2p</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>

diff --git a/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml
@@ -23,7 +23,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <artifactId>dubbo-remoting-redis</artifactId>
 
     <packaging>jar</packaging>

diff --git a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dubbo-rpc-hessian</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-serialization-native-hession</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>3.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dubbo-rpc-http</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <description>The JSON-RPC module of dubbo project</description>
 

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
@@ -31,7 +31,7 @@
         <dubbo.version>3.0.4</dubbo.version>
         <junit.version>4.13.1</junit.version>
         <spring.version>4.3.30.RELEASE</spring.version>
-        <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
+        <dubbo.serialization.version>3.2.0-SNAPSHOT</dubbo.serialization.version>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>
 

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
@@ -32,7 +32,7 @@
         <dubbo.version>3.2.7</dubbo.version>
         <junit.version>4.13.1</junit.version>
         <spring.version>4.3.30.RELEASE</spring.version>
-        <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
+        <dubbo.serialization.version>3.2.0-SNAPSHOT</dubbo.serialization.version>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>
 

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
@@ -32,7 +32,7 @@
         <dubbo.version>3.0.4</dubbo.version>
         <junit.version>4.13.1</junit.version>
         <spring.version>4.3.30.RELEASE</spring.version>
-        <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
+        <dubbo.serialization.version>3.2.0-SNAPSHOT</dubbo.serialization.version>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>
 

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
@@ -32,7 +32,7 @@
         <dubbo.version>3.0.4</dubbo.version>
         <junit.version>4.13.1</junit.version>
         <spring.version>4.3.30.RELEASE</spring.version>
-        <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
+        <dubbo.serialization.version>3.2.0-SNAPSHOT</dubbo.serialization.version>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>
 

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
@@ -33,7 +33,7 @@
         <junit.version>4.13.1</junit.version>
         <spring.version>4.3.30.RELEASE</spring.version>
         <dubbo.extensions.version>1.0.5-SNAPSHOT</dubbo.extensions.version>
-        <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
+        <dubbo.serialization.version>3.2.0-SNAPSHOT</dubbo.serialization.version>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>
 

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
@@ -33,7 +33,7 @@
         <junit.version>4.13.1</junit.version>
         <spring.version>4.3.30.RELEASE</spring.version>
         <dubbo.compiler.version>0.0.2</dubbo.compiler.version>
-        <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
+        <dubbo.serialization.version>3.2.0-SNAPSHOT</dubbo.serialization.version>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>
 

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
@@ -32,7 +32,7 @@
         <dubbo.version>3.0.4</dubbo.version>
         <junit.version>4.13.1</junit.version>
         <spring.version>4.3.30.RELEASE</spring.version>
-        <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
+        <dubbo.serialization.version>3.2.0-SNAPSHOT</dubbo.serialization.version>
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     </properties>