Merge branch 'apache:3.2' into 3.2

wcy666103 · Apr 13, 2024 · f562cb8 · f562cb8
2 parents 9d0d994 + 155c2f2
commit f562cb8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,6 @@ dubbo-demo/dubbo-demo-triple/build/*
 
 .git.exec.error
 
+# log files generated by testcase.
+dubbo-rpc/dubbo-rpc-api/custom-access.log*
+
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ There's a [README](https://github.com/apache/dubbo-samples/blob/389cd612f1ea57ee
 
 ```xml
 <properties>
-    <dubbo.version>3.2.11</dubbo.version>
+    <dubbo.version>3.2.13-SNAPSHOT</dubbo.version>
 </properties>
 
 <dependencies>

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
@@ -170,7 +170,7 @@
     <spotless.action>check</spotless.action>
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
-    <revision>3.2.12-SNAPSHOT</revision>
+    <revision>3.2.13-SNAPSHOT</revision>
   </properties>
 
   <dependencyManagement>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -31,7 +31,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <revision>3.2.12-SNAPSHOT</revision>
+    <revision>3.2.13-SNAPSHOT</revision>
     <maven_flatten_version>1.6.0</maven_flatten_version>
     <curator5_version>5.1.0</curator5_version>
     <zookeeper_version>3.8.4</zookeeper_version>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -31,7 +31,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <revision>3.2.12-SNAPSHOT</revision>
+    <revision>3.2.13-SNAPSHOT</revision>
     <maven_flatten_version>1.6.0</maven_flatten_version>
     <curator_version>4.3.0</curator_version>
     <zookeeper_version>3.4.14</zookeeper_version>

diff --git a/pom.xml b/pom.xml
@@ -169,7 +169,7 @@
     <spotless.action>check</spotless.action>
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
-    <revision>3.2.12-SNAPSHOT</revision>
+    <revision>3.2.13-SNAPSHOT</revision>
   </properties>
 
   <dependencyManagement>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -50,3 +50,6 @@ dubbo-demo/dubbo-demo-triple/build/*

		.git.exec.error

		# log files generated by testcase.
		dubbo-rpc/dubbo-rpc-api/custom-access.log*