Merge branch '3.1' into 3.1-callback-filter

wuwen5 · Aug 1, 2023 · 9450f94 · 9450f94
2 parents d1019cb + ae9742d
commit 9450f94
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
@@ -182,7 +182,7 @@
         <portlet_version>2.0</portlet_version>
         <maven_flatten_version>1.1.0</maven_flatten_version>
         <commons_compress_version>1.21</commons_compress_version>
-        <revision>3.1.11-SNAPSHOT</revision>
+        <revision>3.1.12-SNAPSHOT</revision>
     </properties>
 
     <dependencyManagement>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -32,7 +32,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>3.1.11-SNAPSHOT</revision>
+        <revision>3.1.12-SNAPSHOT</revision>
         <maven_flatten_version>1.1.0</maven_flatten_version>
         <curator_version>5.1.0</curator_version>
         <zookeeper_version>3.7.0</zookeeper_version>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>3.1.11-SNAPSHOT</revision>
+        <revision>3.1.12-SNAPSHOT</revision>
         <maven_flatten_version>1.1.0</maven_flatten_version>
         <curator_version>4.2.0</curator_version>
         <zookeeper_version>3.4.14</zookeeper_version>

diff --git a/...ain/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java b/...ain/java/org/apache/dubbo/registry/client/metadata/StandardMetadataServiceURLBuilder.java
@@ -107,7 +107,6 @@ private URL generateWithMetadata(String serviceName, String host, Map<String, St
             .setProtocol(protocol)
             .setPath(MetadataService.class.getName())
             .addParameter(TIMEOUT_KEY, ConfigurationUtils.get(applicationModel, METADATA_PROXY_TIMEOUT_KEY, DEFAULT_METADATA_TIMEOUT_VALUE))
-            .addParameter(SIDE_KEY, CONSUMER)
             .addParameter(CONNECTIONS_KEY, 1)
             .addParameter(THREADPOOL_KEY, "cached")
             .addParameter(THREADS_KEY, "100")
@@ -119,6 +118,7 @@ private URL generateWithMetadata(String serviceName, String host, Map<String, St
 
         // add the default parameters
         urlBuilder.addParameter(GROUP_KEY, serviceName);
+        urlBuilder.addParameter(SIDE_KEY, CONSUMER);
         return urlBuilder.build();
     }
 

diff --git a/pom.xml b/pom.xml
@@ -129,7 +129,7 @@
         <checkstyle_unix.skip>true</checkstyle_unix.skip>
         <rat.skip>true</rat.skip>
         <jacoco.skip>true</jacoco.skip>
-        <revision>3.1.11-SNAPSHOT</revision>
+        <revision>3.1.12-SNAPSHOT</revision>
     </properties>
 
     <modules>