From 63e5bef4fac4b8a332f1313d80cfec08828cfaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=81=AA=E6=B4=8B?=
 <56506697+wcy666103@users.noreply.github.com>
Date: Thu, 30 May 2024 18:03:15 +0800
Subject: [PATCH 01/20] fix opentelemetry version change (#14252)

* fix opentelemetry version change

* format code
---
 .../autoconfigure/exporter/zipkin/HttpSender.java           | 6 +++---
 .../autoconfigure/exporter/zipkin/ZipkinConfigurations.java | 2 +-
 .../exporter/zipkin/ZipkinRestTemplateSender.java           | 4 ++--
 .../exporter/zipkin/ZipkinWebClientSender.java              | 4 ++--
 .../dubbo-spring-boot-starters/observability/pom.xml        | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
index 8b4fe1261f..eca49c9349 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
@@ -25,11 +25,11 @@ import java.util.zip.GZIPOutputStream;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.unit.DataSize;
-import zipkin2.Call;
-import zipkin2.CheckResult;
-import zipkin2.codec.Encoding;
 import zipkin2.reporter.BytesMessageEncoder;
+import zipkin2.reporter.Call;
+import zipkin2.reporter.CheckResult;
 import zipkin2.reporter.ClosedSenderException;
+import zipkin2.reporter.Encoding;
 import zipkin2.reporter.Sender;
 
 /**
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
index cb5e3701a0..fd50844d9a 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
@@ -134,7 +134,7 @@ class ZipkinConfigurations {
         @ConditionalOnMissingBean
         @ConditionalOnBean(Sender.class)
         AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) {
-            return AsyncReporter.builder(sender).build(encoder);
+            return AsyncReporter.builder(sender).build((zipkin2.reporter.BytesEncoder<Span>) encoder);
         }
     }
 
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
index acd3b5b733..4fda686dc5 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
@@ -19,8 +19,8 @@ package org.apache.dubbo.spring.boot.observability.autoconfigure.exporter.zipkin
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.client.RestTemplate;
-import zipkin2.Call;
-import zipkin2.Callback;
+import zipkin2.reporter.Call;
+import zipkin2.reporter.Callback;
 
 class ZipkinRestTemplateSender extends HttpSender {
     private final String endpoint;
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
index 637d1c5016..e2f9d2f2dd 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
@@ -20,8 +20,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
-import zipkin2.Call;
-import zipkin2.Callback;
+import zipkin2.reporter.Call;
+import zipkin2.reporter.Callback;
 
 class ZipkinWebClientSender extends HttpSender {
     private final String endpoint;
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 db97674552..9978d92bcc 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
@@ -38,8 +38,8 @@
   <properties>
     <micrometer.version>1.13.0</micrometer.version>
     <micrometer-tracing.version>1.2.5</micrometer-tracing.version>
-    <opentelemetry.version>1.34.1</opentelemetry.version>
-    <zipkin-reporter.version>2.17.2</zipkin-reporter.version>
+    <opentelemetry.version>1.38.0</opentelemetry.version>
+    <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
     <prometheus-client.version>0.16.0</prometheus-client.version>
   </properties>
 

From d35d7eb30c9e536bead96d50d45ff6def219f84f Mon Sep 17 00:00:00 2001
From: aofall <10182210+aofall@users.noreply.github.com>
Date: Fri, 31 May 2024 15:05:16 +0800
Subject: [PATCH 02/20] fix: Disable accesslog while the config is false
 (#14257)

---
 .../main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
index 1469630781..d0b0b4b392 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
@@ -108,7 +108,7 @@ public class AccessLogFilter implements Filter {
     public Result invoke(Invoker<?> invoker, Invocation inv) throws RpcException {
         String accessLogKey = invoker.getUrl().getParameter(Constants.ACCESS_LOG_KEY);
         boolean isFixedPath = invoker.getUrl().getParameter(ACCESS_LOG_FIXED_PATH_KEY, true);
-        if (StringUtils.isEmpty(accessLogKey)) {
+        if (StringUtils.isEmpty(accessLogKey) || "false".equalsIgnoreCase(accessLogKey)) {
             // Notice that disable accesslog of one service may cause the whole application to stop collecting
             // accesslog.
             // It's recommended to use application level configuration to enable or disable accesslog if dynamically

From 95f99845713ac4ab98201c4e83052411a23736f6 Mon Sep 17 00:00:00 2001
From: caoyanan666 <55247691+caoyanan666@users.noreply.github.com>
Date: Fri, 31 May 2024 16:26:59 +0800
Subject: [PATCH 03/20] fix triple reactor call throws "Too many response for
 unary method" exception (#14261)

Co-authored-by: caoyanan <caoyanan@growingio.com>
---
 .../apache/dubbo/reactive/calls/ReactorServerCalls.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorServerCalls.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorServerCalls.java
index 24218a1b08..8cf1ef3ed8 100644
--- a/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorServerCalls.java
+++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorServerCalls.java
@@ -48,13 +48,11 @@ public final class ReactorServerCalls {
     public static <T, R> void oneToOne(T request, StreamObserver<R> responseObserver, Function<Mono<T>, Mono<R>> func) {
         try {
             func.apply(Mono.just(request))
+                    .switchIfEmpty(Mono.error(TriRpcStatus.NOT_FOUND.asException()))
                     .subscribe(
-                            res -> {
-                                responseObserver.onNext(res);
-                                responseObserver.onCompleted();
-                            },
+                            responseObserver::onNext,
                             throwable -> doOnResponseHasException(throwable, responseObserver),
-                            () -> doOnResponseHasException(TriRpcStatus.NOT_FOUND.asException(), responseObserver));
+                            responseObserver::onCompleted);
         } catch (Throwable throwable) {
             doOnResponseHasException(throwable, responseObserver);
         }

From 600f869ad76e27d1cd4f6dc43cad994c81966a0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:38:23 +0800
Subject: [PATCH 04/20] Bump com.alibaba.fastjson2:fastjson2 from 2.0.49 to
 2.0.51 (#14272)

Bumps [com.alibaba.fastjson2:fastjson2](https://github.com/alibaba/fastjson2) from 2.0.49 to 2.0.51.
- [Release notes](https://github.com/alibaba/fastjson2/releases)
- [Commits](https://github.com/alibaba/fastjson2/compare/2.0.49...2.0.51)

---
updated-dependencies:
- dependency-name: com.alibaba.fastjson2:fastjson2
  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 523f04515e..ae08191a45 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -99,7 +99,7 @@
     <httpclient_version>4.5.14</httpclient_version>
     <httpcore_version>4.4.16</httpcore_version>
     <fastjson_version>1.2.83</fastjson_version>
-    <fastjson2_version>2.0.49</fastjson2_version>
+    <fastjson2_version>2.0.51</fastjson2_version>
     <zookeeper_version>3.7.0</zookeeper_version>
     <curator_version>5.1.0</curator_version>
     <curator_test_version>2.12.0</curator_test_version>

From 0baba8646b516ed0f863a80b2ab7cfe3160b7c22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:38:33 +0800
Subject: [PATCH 05/20] Bump bytebuddy.version from 1.14.15 to 1.14.17 (#14273)

Bumps `bytebuddy.version` from 1.14.15 to 1.14.17.

Updates `net.bytebuddy:byte-buddy` from 1.14.15 to 1.14.17
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.15...byte-buddy-1.14.17)

Updates `net.bytebuddy:byte-buddy-agent` from 1.14.15 to 1.14.17
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.15...byte-buddy-1.14.17)

---
updated-dependencies:
- dependency-name: net.bytebuddy:byte-buddy
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: net.bytebuddy:byte-buddy-agent
  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-spring-boot/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml
index 807bcd9b81..1e097e4b35 100644
--- a/dubbo-spring-boot/pom.xml
+++ b/dubbo-spring-boot/pom.xml
@@ -43,7 +43,7 @@
     <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
     <log4j2_version>2.23.1</log4j2_version>
     <!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version -->
-    <byte-buddy.version>1.14.15</byte-buddy.version>
+    <byte-buddy.version>1.14.17</byte-buddy.version>
   </properties>
 
   <dependencyManagement>

From 913a9aac33388f4b1f9628ec7e581f5a1841bc0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:38:41 +0800
Subject: [PATCH 06/20] Bump org.apache.maven.plugins:maven-plugin-plugin from
 3.13.0 to 3.13.1 (#14278)

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

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  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-maven-plugin/pom.xml  | 2 +-
 dubbo-native-plugin/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml
index 15adcc3e19..5cdf527a6d 100644
--- a/dubbo-maven-plugin/pom.xml
+++ b/dubbo-maven-plugin/pom.xml
@@ -74,7 +74,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.13.0</version>
+        <version>3.13.1</version>
         <configuration>
           <goalPrefix>dubbo</goalPrefix>
         </configuration>
diff --git a/dubbo-native-plugin/pom.xml b/dubbo-native-plugin/pom.xml
index da9b70fc36..638f9fb88a 100644
--- a/dubbo-native-plugin/pom.xml
+++ b/dubbo-native-plugin/pom.xml
@@ -77,7 +77,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.13.0</version>
+        <version>3.13.1</version>
         <configuration>
           <goalPrefix>dubbo</goalPrefix>
         </configuration>

From a581afbb2c459fe5fdb90ba6bcf92d5b672434f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:38:51 +0800
Subject: [PATCH 07/20] Bump
 org.apache.maven.plugin-tools:maven-plugin-annotations (#14276)

Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.13.0 to 3.13.1.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.13.0...maven-plugin-tools-3.13.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  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-maven-plugin/pom.xml  | 2 +-
 dubbo-native-plugin/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml
index 5cdf527a6d..8deb6db0d6 100644
--- a/dubbo-maven-plugin/pom.xml
+++ b/dubbo-maven-plugin/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.13.0</version>
+      <version>3.13.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/dubbo-native-plugin/pom.xml b/dubbo-native-plugin/pom.xml
index 638f9fb88a..f0e6f80561 100644
--- a/dubbo-native-plugin/pom.xml
+++ b/dubbo-native-plugin/pom.xml
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.13.0</version>
+      <version>3.13.1</version>
       <scope>provided</scope>
     </dependency>
 

From 26113503e8085c65cf0a978cec453233003b16b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:39:15 +0800
Subject: [PATCH 08/20] Bump org.apache.maven.plugins:maven-shade-plugin from
 3.5.3 to 3.6.0 (#14271)

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

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-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 edb5063a08..3df5deeab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,7 +315,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.5.3</version>
+          <version>3.6.0</version>
           <configuration>
             <createDependencyReducedPom>false</createDependencyReducedPom>
           </configuration>

From 8fee3db28ff6b5c2164ec93e80d09ff53bbdb0a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:39:24 +0800
Subject: [PATCH 09/20] Bump org.apache.maven.plugins:maven-javadoc-plugin from
 3.6.3 to 3.7.0 (#14274)

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

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-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 3df5deeab3..61adbed1c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
     <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>
-    <maven_javadoc_version>3.6.3</maven_javadoc_version>
+    <maven_javadoc_version>3.7.0</maven_javadoc_version>
     <maven_jetty_version>9.4.54.v20240208</maven_jetty_version>
     <maven_checkstyle_version>3.3.1</maven_checkstyle_version>
     <maven_jacoco_version>0.8.12</maven_jacoco_version>

From 9fde4c9e6096703d8eceed9e9ccde33d095a40c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:39:36 +0800
Subject: [PATCH 10/20] Bump org.apache.maven.plugins:maven-enforcer-plugin
 from 3.4.1 to 3.5.0 (#14277)

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

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-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 61adbed1c8..472134a92a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
     <maven_checkstyle_version>3.3.1</maven_checkstyle_version>
     <maven_jacoco_version>0.8.12</maven_jacoco_version>
     <maven_flatten_version>1.6.0</maven_flatten_version>
-    <maven_enforce_version>3.4.1</maven_enforce_version>
+    <maven_enforce_version>3.5.0</maven_enforce_version>
     <maven_antrun_version>3.1.0</maven_antrun_version>
     <maven_os_plugin_version>1.7.1</maven_os_plugin_version>
     <maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version>

From 473ea36b04d93e2efc439848ff65ec5b3bee06d9 Mon Sep 17 00:00:00 2001
From: aofall <10182210+aofall@users.noreply.github.com>
Date: Tue, 4 Jun 2024 12:54:44 +0800
Subject: [PATCH 11/20] fix: Support close the Curator EnsembleTracker (#14281)

---
 .../org/apache/dubbo/common/constants/CommonConstants.java     | 2 ++
 .../dubbo/remoting/zookeeper/AbstractZookeeperClient.java      | 1 +
 .../remoting/zookeeper/curator5/Curator5ZookeeperClient.java   | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index 0178a5382c..e026499418 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@ -646,4 +646,6 @@ public interface CommonConstants {
     String DUBBO_MANUAL_REGISTER_KEY = "dubbo.application.manual-register";
 
     String DUBBO2_COMPACT_ENABLE = "dubbo.compact.enable";
+
+    String ZOOKEEPER_ENSEMBLE_TRACKER_KEY = "zookeeper.ensemble.tracker";
 }
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperClient.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperClient.java
index e830246617..caef4385bf 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperClient.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/zookeeper/AbstractZookeeperClient.java
@@ -40,6 +40,7 @@ public abstract class AbstractZookeeperClient<TargetDataListener, TargetChildLis
     // may hang up to wait name resolution up to 10s
     protected int DEFAULT_CONNECTION_TIMEOUT_MS = 30 * 1000;
     protected int DEFAULT_SESSION_TIMEOUT_MS = 60 * 1000;
+    protected boolean DEFAULT_ENSEMBLE_TRACKER = true;
 
     private final URL url;
 
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClient.java
index 65b6bd6797..1afb7fc1dc 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClient.java
+++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/src/main/java/org/apache/dubbo/remoting/zookeeper/curator5/Curator5ZookeeperClient.java
@@ -55,6 +55,7 @@ import org.apache.zookeeper.data.Stat;
 
 import static org.apache.dubbo.common.constants.CommonConstants.SESSION_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.ZOOKEEPER_ENSEMBLE_TRACKER_KEY;
 import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_CONNECT_REGISTRY;
 import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ZOOKEEPER_EXCEPTION;
 
@@ -74,10 +75,12 @@ public class Curator5ZookeeperClient
         try {
             int timeout = url.getParameter(TIMEOUT_KEY, DEFAULT_CONNECTION_TIMEOUT_MS);
             int sessionExpireMs = url.getParameter(SESSION_KEY, DEFAULT_SESSION_TIMEOUT_MS);
+            boolean ensembleTracker = url.getParameter(ZOOKEEPER_ENSEMBLE_TRACKER_KEY, DEFAULT_ENSEMBLE_TRACKER);
             CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
                     .connectString(url.getBackupAddress())
                     .retryPolicy(new RetryNTimes(1, 1000))
                     .connectionTimeoutMs(timeout)
+                    .ensembleTracker(ensembleTracker)
                     .sessionTimeoutMs(sessionExpireMs);
             String userInformation = url.getUserInformation();
             if (userInformation != null && userInformation.length() > 0) {

From 523a4189b8a7233c926eab1218daf627a3e870b8 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Tue, 4 Jun 2024 22:59:16 +0800
Subject: [PATCH 12/20] Move dubbo versions file from META-INF/versions to
 META-INF/dubbo-version (#14247)

* Move dubbo versions file from META-INF/versions to META-INF/dubbo-versions

* Make 'META-INF/dubbo-versions' as constants
---
 .../java/org/apache/dubbo/common/Version.java |  8 +++---
 .../common/constants/CommonConstants.java     | 26 +++++++++++++++++--
 .../dubbo/common/version/VersionTest.java     |  9 +++----
 .../org/apache/dubbo/dependency/FileTest.java |  4 ++-
 pom.xml                                       |  4 +--
 5 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
index 90f2b70704..5c436fd345 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
@@ -16,6 +16,7 @@
  */
 package org.apache.dubbo.common;
 
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.StringUtils;
@@ -84,7 +85,8 @@ public final class Version {
     }
 
     private static void tryLoadVersionFromResource() throws IOException {
-        Enumeration<URL> configLoader = Version.class.getClassLoader().getResources("META-INF/versions/dubbo-common");
+        Enumeration<URL> configLoader =
+                Version.class.getClassLoader().getResources(CommonConstants.DUBBO_VERSIONS_KEY + "/dubbo-common");
         if (configLoader.hasMoreElements()) {
             URL url = configLoader.nextElement();
             try (BufferedReader reader =
@@ -312,7 +314,7 @@ public final class Version {
 
     private static void checkArtifact(String artifactId) throws IOException {
         Enumeration<URL> artifactEnumeration =
-                Version.class.getClassLoader().getResources("META-INF/versions/" + artifactId);
+                Version.class.getClassLoader().getResources(CommonConstants.DUBBO_VERSIONS_KEY + artifactId);
         while (artifactEnumeration.hasMoreElements()) {
             URL url = artifactEnumeration.nextElement();
             try (BufferedReader reader =
@@ -348,7 +350,7 @@ public final class Version {
 
     private static Set<String> loadArtifactIds() throws IOException {
         Enumeration<URL> artifactsEnumeration =
-                Version.class.getClassLoader().getResources("META-INF/versions/.artifacts");
+                Version.class.getClassLoader().getResources(CommonConstants.DUBBO_VERSIONS_KEY + "/.artifacts");
         Set<String> artifactIds = new HashSet<>();
         while (artifactsEnumeration.hasMoreElements()) {
             URL url = artifactsEnumeration.nextElement();
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index e026499418..704b30c74c 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.regex.Pattern;
 
 public interface CommonConstants {
+
     String DUBBO = "dubbo";
 
     String TRIPLE = "tri";
@@ -267,12 +268,14 @@ public interface CommonConstants {
     String $INVOKE = "$invoke";
 
     String $INVOKE_ASYNC = "$invokeAsync";
+
     String GENERIC_PARAMETER_DESC = "Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/Object;";
 
     /**
      * echo call
      */
     String $ECHO = "$echo";
+
     /**
      * package version in the manifest
      */
@@ -283,12 +286,19 @@ public interface CommonConstants {
     int MAX_PROXY_COUNT = 65535;
 
     String MONITOR_KEY = "monitor";
+
     String BACKGROUND_KEY = "background";
+
     String CLUSTER_KEY = "cluster";
+
     String USERNAME_KEY = "username";
+
     String PASSWORD_KEY = "password";
+
     String HOST_KEY = "host";
+
     String PORT_KEY = "port";
+
     String DUBBO_IP_TO_BIND = "DUBBO_IP_TO_BIND";
 
     /**
@@ -308,21 +318,29 @@ public interface CommonConstants {
     String SHUTDOWN_WAIT_SECONDS_KEY = "dubbo.service.shutdown.wait.seconds";
 
     String SHUTDOWN_WAIT_KEY = "dubbo.service.shutdown.wait";
+
     String DUBBO_PROTOCOL = "dubbo";
 
     String DUBBO_LABELS = "dubbo.labels";
+
     String DUBBO_ENV_KEYS = "dubbo.env.keys";
 
     String CONFIG_CONFIGFILE_KEY = "config-file";
+
     String CONFIG_ENABLE_KEY = "highest-priority";
+
     String CONFIG_NAMESPACE_KEY = "namespace";
+
     String CHECK_KEY = "check";
 
     String BACKLOG_KEY = "backlog";
 
     String HEARTBEAT_EVENT = null;
+
     String MOCK_HEARTBEAT_EVENT = "H";
+
     String READONLY_EVENT = "R";
+
     String WRITEABLE_EVENT = "W";
 
     String REFERENCE_FILTER_KEY = "reference.filter";
@@ -459,6 +477,7 @@ public interface CommonConstants {
     String REGISTRY_DELAY_NOTIFICATION_KEY = "delay-notification";
 
     String CACHE_CLEAR_TASK_INTERVAL = "dubbo.application.url.cache.task.interval";
+
     String CACHE_CLEAR_WAITING_THRESHOLD = "dubbo.application.url.cache.clear.waiting";
 
     String CLUSTER_INTERCEPTOR_COMPATIBLE_KEY = "dubbo.application.cluster.interceptor.compatible";
@@ -615,17 +634,18 @@ public interface CommonConstants {
     String SERVICE_EXECUTOR = "service-executor";
 
     String EXECUTOR_MANAGEMENT_MODE = "executor-management-mode";
+
     String EXECUTOR_MANAGEMENT_MODE_DEFAULT = "default";
+
     String EXECUTOR_MANAGEMENT_MODE_ISOLATION = "isolation";
 
     /**
-     *
      * used in JVMUtil.java ,Control stack print lines, default is 32 lines
-     *
      */
     String DUBBO_JSTACK_MAXLINE = "dubbo.jstack-dump.max-line";
 
     String ENCODE_IN_IO_THREAD_KEY = "encode.in.io";
+
     boolean DEFAULT_ENCODE_IN_IO_THREAD = false;
 
     /**
@@ -648,4 +668,6 @@ public interface CommonConstants {
     String DUBBO2_COMPACT_ENABLE = "dubbo.compact.enable";
 
     String ZOOKEEPER_ENSEMBLE_TRACKER_KEY = "zookeeper.ensemble.tracker";
+
+    String DUBBO_VERSIONS_KEY = "META-INF/dubbo-versions";
 }
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java
index 69dd5dbb08..0c37dc79c7 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java
@@ -17,6 +17,7 @@
 package org.apache.dubbo.common.version;
 
 import org.apache.dubbo.common.Version;
+import org.apache.dubbo.common.constants.CommonConstants;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -110,7 +111,7 @@ class VersionTest {
         ClassLoader classLoader = new ClassLoader(originClassLoader) {
             @Override
             public Class<?> loadClass(String name) throws ClassNotFoundException {
-                if (name.equals("org.apache.dubbo.common.Version")) {
+                if ("org.apache.dubbo.common.Version".equals(name)) {
                     return findClass(name);
                 }
                 return super.loadClass(name);
@@ -145,15 +146,13 @@ class VersionTest {
 
             @Override
             public Enumeration<URL> getResources(String name) throws IOException {
-
-                if (name.equals("META-INF/versions/dubbo-common")) {
+                if (name.equals(CommonConstants.DUBBO_VERSIONS_KEY + "/dubbo-common")) {
                     return super.getResources("META-INF/test-versions/dubbo-common");
                 }
                 return super.getResources(name);
             }
         };
-        Class<?> versionClass = classLoader.loadClass("org.apache.dubbo.common.Version");
-        return versionClass;
+        return classLoader.loadClass("org.apache.dubbo.common.Version");
     }
 
     @Test
diff --git a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
index 209a25ff58..be443f2c94 100644
--- a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
+++ b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.dubbo.dependency;
 
+import org.apache.dubbo.common.constants.CommonConstants;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -133,7 +135,7 @@ class FileTest {
         List<String> artifactIdsInRoot = IOUtils.readLines(
                 this.getClass()
                         .getClassLoader()
-                        .getResource("META-INF/versions/.artifacts")
+                        .getResource(CommonConstants.DUBBO_VERSIONS_KEY + "/.artifacts")
                         .openStream(),
                 StandardCharsets.UTF_8);
         artifactIdsInRoot.removeIf(s -> s.startsWith("#"));
diff --git a/pom.xml b/pom.xml
index 472134a92a..52e9cf3eb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@
         </includes>
       </resource>
       <resource>
-        <targetPath>META-INF/versions</targetPath>
+        <targetPath>META-INF/dubbo-versions</targetPath>
         <filtering>false</filtering>
         <directory>${maven.multiModuleProjectDirectory}</directory>
         <includes>
@@ -430,7 +430,7 @@
             <configuration>
               <failOnError>true</failOnError>
               <target>
-                <property name="version_file" value="${project.build.outputDirectory}/META-INF/versions/${project.artifactId}" />
+                <property name="version_file" value="${project.build.outputDirectory}/META-INF/dubbo-versions/${project.artifactId}" />
                 <!-- get the current version of dubbo -->
                 <echo file="${version_file}" message="revision=${revision}${line.separator}" />
                 <!-- attach the artifact id -->

From 48ad387ace4e260abf0909464e94f8bfe309849f Mon Sep 17 00:00:00 2001
From: xiaosheng <songxiaosheng@elastic.link>
Date: Tue, 4 Jun 2024 23:17:13 +0800
Subject: [PATCH 13/20] :arrow_up: upgrade micrometer tracing to 1.3.0 (#14284)

* :arrow_up: upgrade micrometer tracing to 1.3.0

* :arrow_up: upgrade micrometer tracing to 1.3.0
---
 dubbo-dependencies-bom/pom.xml                                  | 2 +-
 .../dubbo/metrics/aggregate/TimeWindowAggregatorTest.java       | 2 +-
 .../dubbo-spring-boot-starters/observability/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 ae08191a45..69588a65ab 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.2.5</micrometer-tracing.version>
+    <micrometer-tracing.version>1.3.0</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-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/aggregate/TimeWindowAggregatorTest.java b/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/aggregate/TimeWindowAggregatorTest.java
index 80195cf3b5..6f39a571e2 100644
--- a/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/aggregate/TimeWindowAggregatorTest.java
+++ b/dubbo-metrics/dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/aggregate/TimeWindowAggregatorTest.java
@@ -18,8 +18,8 @@ package org.apache.dubbo.metrics.aggregate;
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class TimeWindowAggregatorTest {
     @Test
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 9978d92bcc..d31cb51935 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.2.5</micrometer-tracing.version>
+    <micrometer-tracing.version>1.3.0</micrometer-tracing.version>
     <opentelemetry.version>1.38.0</opentelemetry.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
     <prometheus-client.version>0.16.0</prometheus-client.version>

From a534350541c94709b6f529c2b3a0f1cd6d44c3dc Mon Sep 17 00:00:00 2001
From: aofall <10182210+aofall@users.noreply.github.com>
Date: Wed, 5 Jun 2024 11:39:27 +0800
Subject: [PATCH 14/20] fix: Support disable Curator EnsembleTracker in
 ServiceDiscovery (#14285)

---
 .../dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java
index 83b47fc1c1..b5cf4a4118 100644
--- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java
+++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/util/CuratorFrameworkUtils.java
@@ -43,6 +43,7 @@ import org.apache.zookeeper.data.ACL;
 
 import static org.apache.curator.x.discovery.ServiceInstance.builder;
 import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
+import static org.apache.dubbo.common.constants.CommonConstants.ZOOKEEPER_ENSEMBLE_TRACKER_KEY;
 import static org.apache.dubbo.registry.zookeeper.ZookeeperServiceDiscovery.DEFAULT_GROUP;
 import static org.apache.dubbo.registry.zookeeper.util.CuratorFrameworkParams.BASE_SLEEP_TIME;
 import static org.apache.dubbo.registry.zookeeper.util.CuratorFrameworkParams.BLOCK_UNTIL_CONNECTED_UNIT;
@@ -69,8 +70,10 @@ public abstract class CuratorFrameworkUtils {
 
     public static CuratorFramework buildCuratorFramework(URL connectionURL, ZookeeperServiceDiscovery serviceDiscovery)
             throws Exception {
+        boolean ensembleTracker = connectionURL.getParameter(ZOOKEEPER_ENSEMBLE_TRACKER_KEY, true);
         CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
                 .connectString(connectionURL.getBackupAddress())
+                .ensembleTracker(ensembleTracker)
                 .retryPolicy(buildRetryPolicy(connectionURL));
         String userInformation = connectionURL.getUserInformation();
         if (StringUtils.isNotEmpty(userInformation)) {

From d3eef04759df8a6df6758a21778b1c9d4c635387 Mon Sep 17 00:00:00 2001
From: xixingya <2679431923@qq.com>
Date: Thu, 6 Jun 2024 22:34:20 +0800
Subject: [PATCH 15/20] fix DubboRelaxedBinding2AutoConfiguration and
 DubboAutoConfiguration created too early. (#14255)

---
 .../autoconfigure/DubboRelaxedBinding2AutoConfiguration.java    | 2 +-
 .../dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
index 8883a94464..1cc1d70cd5 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
@@ -51,7 +51,7 @@ import static org.springframework.beans.factory.config.ConfigurableBeanFactory.S
  * @see DubboRelaxedBindingAutoConfiguration
  * @since 2.7.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(prefix = DUBBO_PREFIX, name = "enabled", matchIfMissing = true)
 @ConditionalOnClass(name = "org.springframework.boot.context.properties.bind.Binder")
 @AutoConfigureBefore(DubboRelaxedBindingAutoConfiguration.class)
diff --git a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
index 0c2345cc7b..3c230cad83 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
@@ -62,7 +62,7 @@ public class DubboAutoConfiguration {
     @ConditionalOnProperty(prefix = DUBBO_SCAN_PREFIX, name = BASE_PACKAGES_PROPERTY_NAME)
     @ConditionalOnBean(name = BASE_PACKAGES_BEAN_NAME)
     @Bean
-    public ServiceAnnotationPostProcessor serviceAnnotationBeanProcessor(
+    public static ServiceAnnotationPostProcessor serviceAnnotationBeanProcessor(
             @Qualifier(BASE_PACKAGES_BEAN_NAME) Set<String> packagesToScan) {
         return new ServiceAnnotationPostProcessor(packagesToScan);
     }

From 14fd38f1b7d248fdf7e691ef1d805dfbb87ef9db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 23:34:34 +0800
Subject: [PATCH 16/20] Bump
 org.apache.maven.shared:maven-common-artifact-filters (#14306)

Bumps [org.apache.maven.shared:maven-common-artifact-filters](https://github.com/apache/maven-common-artifact-filters) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/apache/maven-common-artifact-filters/releases)
- [Commits](https://github.com/apache/maven-common-artifact-filters/compare/maven-common-artifact-filters-3.3.2...maven-common-artifact-filters-3.4.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.shared:maven-common-artifact-filters
  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>
---
 dubbo-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-maven-plugin/pom.xml b/dubbo-maven-plugin/pom.xml
index 8deb6db0d6..0d41196a02 100644
--- a/dubbo-maven-plugin/pom.xml
+++ b/dubbo-maven-plugin/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-common-artifact-filters</artifactId>
-      <version>3.3.2</version>
+      <version>3.4.0</version>
     </dependency>
 
     <dependency>

From d7ac348f64b58c66b688bbe270de6f3441d2e5e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 23:34:58 +0800
Subject: [PATCH 17/20] Bump org.apache.maven.plugins:maven-checkstyle-plugin
 (#14305)

Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.3.1 to 3.4.0.
- [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.3.1...maven-checkstyle-plugin-3.4.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-checkstyle-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 52e9cf3eb4..bc225d3457 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
     <maven_source_version>3.3.1</maven_source_version>
     <maven_javadoc_version>3.7.0</maven_javadoc_version>
     <maven_jetty_version>9.4.54.v20240208</maven_jetty_version>
-    <maven_checkstyle_version>3.3.1</maven_checkstyle_version>
+    <maven_checkstyle_version>3.4.0</maven_checkstyle_version>
     <maven_jacoco_version>0.8.12</maven_jacoco_version>
     <maven_flatten_version>1.6.0</maven_flatten_version>
     <maven_enforce_version>3.5.0</maven_enforce_version>

From 3e53e320533a90acb4fddfe04d46536f847165f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 23:35:17 +0800
Subject: [PATCH 18/20] Bump io.opentelemetry:opentelemetry-bom from 1.38.0 to
 1.39.0 (#14304)

Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.38.0 to 1.39.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.38.0...v1.39.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  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>
---
 .../dubbo-spring-boot-starters/observability/pom.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d31cb51935..9ae7c54fd6 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
@@ -38,7 +38,7 @@
   <properties>
     <micrometer.version>1.13.0</micrometer.version>
     <micrometer-tracing.version>1.3.0</micrometer-tracing.version>
-    <opentelemetry.version>1.38.0</opentelemetry.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>
   </properties>

From 79fa89bac797ac42baa474435966a787bdc0978a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:47:49 +0800
Subject: [PATCH 19/20] Bump net.bytebuddy:byte-buddy from 1.14.15 to 1.14.17
 (#14275)

Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.14.15 to 1.14.17.
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.15...byte-buddy-1.14.17)

---
updated-dependencies:
- dependency-name: net.bytebuddy:byte-buddy
  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 69588a65ab..0bd68d0ec6 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -93,7 +93,7 @@
     <spring_version>5.3.36</spring_version>
     <spring_security_version>5.8.12</spring_security_version>
     <javassist_version>3.30.2-GA</javassist_version>
-    <bytebuddy.version>1.14.16</bytebuddy.version>
+    <bytebuddy.version>1.14.17</bytebuddy.version>
     <netty_version>3.2.10.Final</netty_version>
     <netty4_version>4.1.110.Final</netty4_version>
     <httpclient_version>4.5.14</httpclient_version>

From b9825cdbd0fdb20694bf69ba670728b953cfacf2 Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Mon, 17 Jun 2024 09:47:10 +0800
Subject: [PATCH 20/20] Update serialize blocked list

---
 dubbo-common/src/main/resources/security/serialize.blockedlist | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dubbo-common/src/main/resources/security/serialize.blockedlist b/dubbo-common/src/main/resources/security/serialize.blockedlist
index 0faf555cbf..f144a7a261 100644
--- a/dubbo-common/src/main/resources/security/serialize.blockedlist
+++ b/dubbo-common/src/main/resources/security/serialize.blockedlist
@@ -190,7 +190,6 @@ org.thymeleaf.
 org.yaml.snakeyaml.tokens.
 pstore.shaded.org.apache.commons.collections.
 sun.print.
-sun.rmi.server.
-sun.rmi.transport.
+sun.rmi.
 weblogic.ejb20.internal.
 weblogic.jms.common.