From 5ad25875b9938a0f77340933be26e8ea7f45f33d Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Mon, 17 Jun 2024 09:49:19 +0800
Subject: [PATCH 01/16] Prepare 3.2.14 release

---
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo-dependencies-zookeeper-curator5/pom.xml               | 2 +-
 dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml         | 2 +-
 pom.xml                                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 0bd68d0ec6..f45477f512 100644
--- 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.14-SNAPSHOT</revision>
+    <revision>3.2.14</revision>
   </properties>
 
   <dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index 65eb7a1d8a..bb6316adce 100644
--- 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.14-SNAPSHOT</revision>
+    <revision>3.2.14</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
index ee4d2087e6..a151bce5ae 100644
--- 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.14-SNAPSHOT</revision>
+    <revision>3.2.14</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
index bc225d3457..669b61b6d4 100644
--- 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.14-SNAPSHOT</revision>
+    <revision>3.2.14</revision>
   </properties>
 
   <dependencyManagement>

From 293711e591fccb2d3ef8ea10013f3ac1a1f83230 Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Mon, 17 Jun 2024 10:17:31 +0800
Subject: [PATCH 02/16] Update 3.3 scheduled workflow (#14322)

---
 .github/workflows/build-and-test-scheduled-3.3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml
index 2ba459be6a..08673d0d56 100644
--- a/.github/workflows/build-and-test-scheduled-3.3.yml
+++ b/.github/workflows/build-and-test-scheduled-3.3.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 8
+          java-version: 21
       - uses: actions/cache@v3
         name: "Cache local Maven repository"
         with:

From 0ccd5a1953da3689124cfd73b5b11005fc370054 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:50:07 +0800
Subject: [PATCH 03/16] Bump netty4_version from 4.1.110.Final to 4.1.111.Final
 (#14324)

Bumps `netty4_version` from 4.1.110.Final to 4.1.111.Final.

Updates `io.netty:netty-all` from 4.1.110.Final to 4.1.111.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.110.Final...netty-4.1.111.Final)

Updates `io.netty:netty-bom` from 4.1.110.Final to 4.1.111.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.110.Final...netty-4.1.111.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-all
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 dubbo-dependencies-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 0bd68d0ec6..c68c78469f 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -95,7 +95,7 @@
     <javassist_version>3.30.2-GA</javassist_version>
     <bytebuddy.version>1.14.17</bytebuddy.version>
     <netty_version>3.2.10.Final</netty_version>
-    <netty4_version>4.1.110.Final</netty4_version>
+    <netty4_version>4.1.111.Final</netty4_version>
     <httpclient_version>4.5.14</httpclient_version>
     <httpcore_version>4.4.16</httpcore_version>
     <fastjson_version>1.2.83</fastjson_version>

From dc2465fff72322bc13196c2a0c85d26687f91608 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:50:16 +0800
Subject: [PATCH 04/16] Bump io.micrometer:micrometer-tracing-bom from 1.3.0 to
 1.3.1 (#14328)

Bumps [io.micrometer:micrometer-tracing-bom](https://github.com/micrometer-metrics/tracing) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/micrometer-metrics/tracing/releases)
- [Commits](https://github.com/micrometer-metrics/tracing/compare/v1.3.0...v1.3.1)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-tracing-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo-spring-boot-starters/observability/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index c68c78469f..c6d2a348f3 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -121,7 +121,7 @@
     <envoy_api_version>0.1.35</envoy_api_version>
     <micrometer.version>1.13.0</micrometer.version>
 
-    <micrometer-tracing.version>1.3.0</micrometer-tracing.version>
+    <micrometer-tracing.version>1.3.1</micrometer-tracing.version>
     <t_digest.version>3.3</t_digest.version>
     <prometheus_client.version>0.16.0</prometheus_client.version>
     <reactive.version>1.0.4</reactive.version>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
index 9ae7c54fd6..478d85891d 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
@@ -37,7 +37,7 @@
 
   <properties>
     <micrometer.version>1.13.0</micrometer.version>
-    <micrometer-tracing.version>1.3.0</micrometer-tracing.version>
+    <micrometer-tracing.version>1.3.1</micrometer-tracing.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
     <prometheus-client.version>0.16.0</prometheus-client.version>

From 086cdd942cedec8b506361be8331a8aa86c4fe9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:50:25 +0800
Subject: [PATCH 05/16] Bump org.apache.maven.plugins:maven-surefire-plugin
 from 3.2.5 to 3.3.0 (#14326)

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.5...surefire-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bc225d3457..66b3d6882f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
     <file_encoding>UTF-8</file_encoding>
     <!-- Maven plugins -->
     <maven_jar_version>3.4.1</maven_jar_version>
-    <maven_surefire_version>3.2.5</maven_surefire_version>
+    <maven_surefire_version>3.3.0</maven_surefire_version>
     <maven_failsafe_version>3.2.5</maven_failsafe_version>
     <maven_deploy_version>2.8.2</maven_deploy_version>
     <maven_compiler_version>3.13.0</maven_compiler_version>

From 61effff7e803c4a6d0730ee84834675cbd2e241e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:50:34 +0800
Subject: [PATCH 06/16] Bump org.apache.maven.plugins:maven-dependency-plugin
 (#14325)

Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.1 to 3.7.0.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.1...maven-dependency-plugin-3.7.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 66b3d6882f..5072803c52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,7 +290,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.1</version>
+          <version>3.7.0</version>
         </plugin>
         <plugin>
           <!-- Do NOT upgrade -->

From 87ab5a69646a19254d91cad542be35fc01469529 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:50:41 +0800
Subject: [PATCH 07/16] Bump io.micrometer:micrometer-core from 1.13.0 to
 1.13.1 (#14327)

Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.0...v1.13.1)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
index 1472ada8ae..6e3280e972 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@ -37,7 +37,7 @@
     <skip_maven_deploy>true</skip_maven_deploy>
     <spring-boot.version>2.7.18</spring-boot.version>
     <spring-boot-maven-plugin.version>2.7.18</spring-boot-maven-plugin.version>
-    <micrometer-core.version>1.13.0</micrometer-core.version>
+    <micrometer-core.version>1.13.1</micrometer-core.version>
   </properties>
   <dependencyManagement>
     <dependencies>

From b76e0597f535439d217239be18823bd2ab628d49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:50:59 +0800
Subject: [PATCH 08/16] Bump spring_version from 5.3.36 to 5.3.37 (#14330)

Bumps `spring_version` from 5.3.36 to 5.3.37.

Updates `org.springframework:spring-test` from 5.3.36 to 5.3.37
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.36...v5.3.37)

Updates `org.springframework:spring-framework-bom` from 5.3.36 to 5.3.37
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.36...v5.3.37)

---
updated-dependencies:
- dependency-name: org.springframework:spring-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.springframework:spring-framework-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 dubbo-dependencies-bom/pom.xml          | 2 +-
 dubbo-test/dubbo-test-spring/pom.xml    | 2 +-
 dubbo-test/dubbo-test-spring3.2/pom.xml | 2 +-
 dubbo-test/dubbo-test-spring4.1/pom.xml | 2 +-
 dubbo-test/dubbo-test-spring4.2/pom.xml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index c6d2a348f3..7a82df3998 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -90,7 +90,7 @@
   <properties>
     <!-- Common libs -->
     <!-- <spring_version>4.3.30.RELEASE</spring_version> -->
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
     <spring_security_version>5.8.12</spring_security_version>
     <javassist_version>3.30.2-GA</javassist_version>
     <bytebuddy.version>1.14.17</bytebuddy.version>
diff --git a/dubbo-test/dubbo-test-spring/pom.xml b/dubbo-test/dubbo-test-spring/pom.xml
index 9ee3bcf9da..29f793a945 100644
--- a/dubbo-test/dubbo-test-spring/pom.xml
+++ b/dubbo-test/dubbo-test-spring/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
     <slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
     <!--<spring_version>4.0.9.RELEASE</spring_version>-->
     <!--<spring_version>4.1.9.RELEASE</spring_version>-->
     <!--<spring_version>4.2.4.RELEASE</spring_version>-->
diff --git a/dubbo-test/dubbo-test-spring3.2/pom.xml b/dubbo-test/dubbo-test-spring3.2/pom.xml
index f610c54bce..c6d1e4168c 100644
--- a/dubbo-test/dubbo-test-spring3.2/pom.xml
+++ b/dubbo-test/dubbo-test-spring3.2/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
   </properties>
 
   <dependencyManagement>
diff --git a/dubbo-test/dubbo-test-spring4.1/pom.xml b/dubbo-test/dubbo-test-spring4.1/pom.xml
index 5ba1a59627..dd5fbc6b1e 100644
--- a/dubbo-test/dubbo-test-spring4.1/pom.xml
+++ b/dubbo-test/dubbo-test-spring4.1/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
   </properties>
 
   <dependencyManagement>
diff --git a/dubbo-test/dubbo-test-spring4.2/pom.xml b/dubbo-test/dubbo-test-spring4.2/pom.xml
index da48d61395..6eb11933d8 100644
--- a/dubbo-test/dubbo-test-spring4.2/pom.xml
+++ b/dubbo-test/dubbo-test-spring4.2/pom.xml
@@ -28,7 +28,7 @@
 
   <properties>
     <skip_maven_deploy>true</skip_maven_deploy>
-    <spring_version>5.3.36</spring_version>
+    <spring_version>5.3.37</spring_version>
   </properties>
 
   <dependencyManagement>

From 8200f3ed2e2e0f6a2a89f689027c37d1ef6d494e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:51:05 +0800
Subject: [PATCH 09/16] Bump org.apache.maven.plugins:maven-release-plugin from
 3.0.1 to 3.1.0 (#14332)

Bumps [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/apache/maven-release/releases)
- [Commits](https://github.com/apache/maven-release/compare/maven-release-3.0.1...maven-release-3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-release-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5072803c52..32db863a3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -448,7 +448,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.0</version>
         <configuration>
           <autoVersionSubmodules>true</autoVersionSubmodules>
           <useReleaseProfile>false</useReleaseProfile>

From cd89d192b6cd9a33d1214263ea9371990c671df4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:51:24 +0800
Subject: [PATCH 10/16] Bump io.projectreactor:reactor-core from 3.6.6 to 3.6.7
 (#14333)

Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.6 to 3.6.7.
- [Release notes](https://github.com/reactor/reactor-core/releases)
- [Commits](https://github.com/reactor/reactor-core/compare/v3.6.6...v3.6.7)

---
updated-dependencies:
- dependency-name: io.projectreactor:reactor-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 dubbo-dependencies-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 7a82df3998..cfa6f7bc80 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -125,7 +125,7 @@
     <t_digest.version>3.3</t_digest.version>
     <prometheus_client.version>0.16.0</prometheus_client.version>
     <reactive.version>1.0.4</reactive.version>
-    <reactor.version>3.6.6</reactor.version>
+    <reactor.version>3.6.7</reactor.version>
     <rxjava.version>2.2.21</rxjava.version>
     <okhttp_version>3.14.9</okhttp_version>
 

From c61cc9f719569d1f1a46dcac9888f74714b45fce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 09:46:44 +0800
Subject: [PATCH 11/16] Bump io.micrometer:micrometer-bom from 1.13.0 to 1.13.1
 (#14331)

Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.13.0...v1.13.1)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo-spring-boot-starters/observability/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index cfa6f7bc80..893a699fc7 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -119,7 +119,7 @@
     <snakeyaml_version>2.2</snakeyaml_version>
     <commons_lang3_version>3.14.0</commons_lang3_version>
     <envoy_api_version>0.1.35</envoy_api_version>
-    <micrometer.version>1.13.0</micrometer.version>
+    <micrometer.version>1.13.1</micrometer.version>
 
     <micrometer-tracing.version>1.3.1</micrometer-tracing.version>
     <t_digest.version>3.3</t_digest.version>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
index 478d85891d..a9448ab331 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
@@ -36,7 +36,7 @@
   </modules>
 
   <properties>
-    <micrometer.version>1.13.0</micrometer.version>
+    <micrometer.version>1.13.1</micrometer.version>
     <micrometer-tracing.version>1.3.1</micrometer-tracing.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>

From 9d333ba906608d1af09f9ba6660458201f839db9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 09:46:55 +0800
Subject: [PATCH 12/16] Bump org.apache.maven.plugins:maven-failsafe-plugin
 from 3.2.5 to 3.3.0 (#14329)

Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.5...surefire-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 32db863a3a..aa5beeac1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
     <!-- Maven plugins -->
     <maven_jar_version>3.4.1</maven_jar_version>
     <maven_surefire_version>3.3.0</maven_surefire_version>
-    <maven_failsafe_version>3.2.5</maven_failsafe_version>
+    <maven_failsafe_version>3.3.0</maven_failsafe_version>
     <maven_deploy_version>2.8.2</maven_deploy_version>
     <maven_compiler_version>3.13.0</maven_compiler_version>
     <maven_source_version>3.3.1</maven_source_version>

From 4be8594bdefa3b941d062cbcee0794a3718c58b1 Mon Sep 17 00:00:00 2001
From: caoyanan666 <55247691+caoyanan666@users.noreply.github.com>
Date: Thu, 20 Jun 2024 09:41:36 +0800
Subject: [PATCH 13/16] fix(3.2): injvm invoker throws ClassCastException
 (#14346)

* fix injvm invoker throws ClassCastException

* fix unit test

* fix unit test

* fix NPE

---------

Co-authored-by: caoyanan <caoyanan@growingio.com>
---
 .../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java
index 68054d7ddb..13e6a0f987 100644
--- a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java
@@ -36,6 +36,7 @@ import org.apache.dubbo.rpc.Result;
 import org.apache.dubbo.rpc.RpcContext;
 import org.apache.dubbo.rpc.RpcException;
 import org.apache.dubbo.rpc.RpcInvocation;
+import org.apache.dubbo.rpc.model.ConsumerModel;
 import org.apache.dubbo.rpc.model.MethodDescriptor;
 import org.apache.dubbo.rpc.model.ServiceModel;
 import org.apache.dubbo.rpc.protocol.AbstractInvoker;
@@ -317,11 +318,18 @@ public class InjvmInvoker<T> extends AbstractInvoker<T> {
         }
 
         Object value = originValue;
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
-            ServiceModel consumerServiceModel = getUrl().getServiceModel();
-            if (consumerServiceModel != null) {
-                Thread.currentThread().setContextClassLoader(consumerServiceModel.getClassLoader());
+            // 1. By default, the classloader of the current Thread is the consumer class loader.
+            ClassLoader consumerClassLoader = contextClassLoader;
+            ServiceModel serviceModel = getUrl().getServiceModel();
+            // 2. If there is a ConsumerModel in the url, the classloader of the ConsumerModel is consumerLoader
+            if (Objects.nonNull(serviceModel) && serviceModel instanceof ConsumerModel) {
+                consumerClassLoader = serviceModel.getClassLoader();
+            }
+            // 3. request result copy
+            if (Objects.nonNull(consumerClassLoader)) {
+                Thread.currentThread().setContextClassLoader(consumerClassLoader);
                 Type[] returnTypes = RpcUtils.getReturnTypes(invocation);
                 if (returnTypes == null) {
                     return originValue;
@@ -334,7 +342,7 @@ public class InjvmInvoker<T> extends AbstractInvoker<T> {
             }
             return value;
         } finally {
-            Thread.currentThread().setContextClassLoader(cl);
+            Thread.currentThread().setContextClassLoader(contextClassLoader);
         }
     }
 

From 92e7b5d807deaf1f21b24171756927579191e195 Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Thu, 20 Jun 2024 10:25:52 +0800
Subject: [PATCH 14/16] Prepare 3.3.0-beta.4 release

---
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo-dependencies-zookeeper-curator5/pom.xml               | 2 +-
 pom.xml                                                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 7781cbf37c..48db10357f 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -186,7 +186,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.3.0-beta.4-SNAPSHOT</revision>
+    <revision>3.3.0-beta.4</revision>
     <open_feign_version>3.1.5</open_feign_version>
     <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
     <jaxb-runtime.version>2.3.3-b02</jaxb-runtime.version>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index 0577d9d0ae..16b311b7b2 100644
--- 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.3.0-beta.4-SNAPSHOT</revision>
+    <revision>3.3.0-beta.4</revision>
     <maven_flatten_version>1.6.0</maven_flatten_version>
     <slf4j_version>1.7.36</slf4j_version>
     <curator5_version>5.1.0</curator5_version>
diff --git a/pom.xml b/pom.xml
index 438bf40857..a2d25c9db7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
 
-    <revision>3.3.0-beta.4-SNAPSHOT</revision>
+    <revision>3.3.0-beta.4</revision>
   </properties>
 
   <dependencyManagement>

From 99601a61989dd61ef1ff43b4d9b3982dcaa19ad3 Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Sun, 23 Jun 2024 19:39:50 +0800
Subject: [PATCH 15/16] Bump version to 3.2.15-SNAPSHOT

---
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo-dependencies-zookeeper-curator5/pom.xml               | 2 +-
 dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml         | 2 +-
 pom.xml                                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 8454418112..ea86d8f2ff 100644
--- 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.14</revision>
+    <revision>3.2.15-SNAPSHOT</revision>
   </properties>
 
   <dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index bb6316adce..797e9a0e8c 100644
--- 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.14</revision>
+    <revision>3.2.15-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
index a151bce5ae..a584416e2c 100644
--- 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.14</revision>
+    <revision>3.2.15-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
index f0cb873df5..73d88547a7 100644
--- 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.14</revision>
+    <revision>3.2.15-SNAPSHOT</revision>
   </properties>
 
   <dependencyManagement>

From 4829be3008daa5d392e554cf5b5d73ce941dbe7c Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Sun, 23 Jun 2024 19:47:25 +0800
Subject: [PATCH 16/16] Bump version to 3.3.0-beta.5-SNAPSHOT

---
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo-dependencies-zookeeper-curator5/pom.xml               | 2 +-
 pom.xml                                                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 83d9ebe816..92bdd8bbe4 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -186,7 +186,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.3.0-beta.4</revision>
+    <revision>3.3.0-beta.5-SNAPSHOT</revision>
     <open_feign_version>3.1.5</open_feign_version>
     <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
     <jaxb-runtime.version>2.3.3-b02</jaxb-runtime.version>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index 16b311b7b2..afdc096434 100644
--- 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.3.0-beta.4</revision>
+    <revision>3.3.0-beta.5-SNAPSHOT</revision>
     <maven_flatten_version>1.6.0</maven_flatten_version>
     <slf4j_version>1.7.36</slf4j_version>
     <curator5_version>5.1.0</curator5_version>
diff --git a/pom.xml b/pom.xml
index 8ad50c96ad..373ca95957 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
 
-    <revision>3.3.0-beta.4</revision>
+    <revision>3.3.0-beta.5-SNAPSHOT</revision>
   </properties>
 
   <dependencyManagement>