From bb376dbdd729c04f449b784d01bf5b26d8b60919 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Fri, 24 May 2024 10:36:08 +0800 Subject: [PATCH 01/14] Prepare 3.2.13 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 7da866f6c0bb..5719e1c3184c 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -170,7 +170,7 @@ check 1.0.0 2.38.0 - 3.2.13-SNAPSHOT + 3.2.13 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index ede7cc94389d..5960bd009c97 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -31,7 +31,7 @@ pom - 3.2.13-SNAPSHOT + 3.2.13 1.6.0 5.1.0 3.8.4 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 50c58232a0b2..cc037b084fdb 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -31,7 +31,7 @@ pom - 3.2.13-SNAPSHOT + 3.2.13 1.6.0 4.3.0 3.4.14 diff --git a/pom.xml b/pom.xml index 50acb7f64636..ac23a5991c74 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ check 1.0.0 2.38.0 - 3.2.13-SNAPSHOT + 3.2.13 From 3609ddb2259ad223f6c0a827e36f6f8ccd38c6b2 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Fri, 24 May 2024 11:11:44 +0800 Subject: [PATCH 02/14] Disable RedisMetadataReportTest on Windows --- .../dubbo/metadata/store/redis/RedisMetadataReportTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dubbo-metadata/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java b/dubbo-metadata/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java index f6212e74e1c7..a716041bff99 100644 --- a/dubbo-metadata/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java +++ b/dubbo-metadata/dubbo-metadata-report-redis/src/test/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReportTest.java @@ -35,6 +35,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import redis.clients.jedis.Jedis; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisDataException; @@ -45,6 +47,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.SYNC_REPORT_KEY; import static redis.embedded.RedisServer.newRedisServer; +@DisabledOnOs(OS.WINDOWS) class RedisMetadataReportTest { private static final String REDIS_URL_TEMPLATE = "redis://%slocalhost:%d", From 6ad71e676ccef5090c00b411df427201fffe8f52 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Wed, 29 May 2024 15:01:57 +0800 Subject: [PATCH 03/14] Bump version to 3.2.14-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 9ba90a4f975a..523f04515eaa 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -170,7 +170,7 @@ check 1.0.0 2.38.0 - 3.2.13 + 3.2.14-SNAPSHOT diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 5960bd009c97..65eb7a1d8a32 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -31,7 +31,7 @@ pom - 3.2.13 + 3.2.14-SNAPSHOT 1.6.0 5.1.0 3.8.4 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index cc037b084fdb..ee4d2087e68a 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -31,7 +31,7 @@ pom - 3.2.13 + 3.2.14-SNAPSHOT 1.6.0 4.3.0 3.4.14 diff --git a/pom.xml b/pom.xml index ac23a5991c74..edb5063a0815 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ check 1.0.0 2.38.0 - 3.2.13 + 3.2.14-SNAPSHOT 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 04/14] 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 8b4fe1261fc0..eca49c9349b2 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 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 cb5e3701a018..fd50844d9a1a 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 @@ static class ReporterConfiguration { @ConditionalOnMissingBean @ConditionalOnBean(Sender.class) AsyncReporter spanReporter(Sender sender, BytesEncoder encoder) { - return AsyncReporter.builder(sender).build(encoder); + return AsyncReporter.builder(sender).build((zipkin2.reporter.BytesEncoder) 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 acd3b5b73376..4fda686dc53d 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 @@ 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 637d1c501614..e2f9d2f2dd25 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.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 db976745527b..9978d92bcc51 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 @@ 1.13.0 1.2.5 - 1.34.1 - 2.17.2 + 1.38.0 + 3.4.0 0.16.0 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 05/14] 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 146963078197..d0b0b4b3923d 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 AccessLogFilter() {} 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 06/14] fix triple reactor call throws "Too many response for unary method" exception (#14261) Co-authored-by: caoyanan --- .../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 24218a1b0824..8cf1ef3ed843 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 @@ private ReactorServerCalls() {} public static void oneToOne(T request, StreamObserver responseObserver, Function, Mono> 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 07/14] 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] 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 523f04515eaa..ae08191a4570 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -99,7 +99,7 @@ 4.5.14 4.4.16 1.2.83 - 2.0.49 + 2.0.51 3.7.0 5.1.0 2.12.0 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 08/14] 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] 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 807bcd9b8137..1e097e4b356c 100644 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@ -43,7 +43,7 @@ 2.23.1 - 1.14.15 + 1.14.17 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 09/14] 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] 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 15adcc3e192a..5cdf527a6d85 100644 --- a/dubbo-maven-plugin/pom.xml +++ b/dubbo-maven-plugin/pom.xml @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.13.0 + 3.13.1 dubbo diff --git a/dubbo-native-plugin/pom.xml b/dubbo-native-plugin/pom.xml index da9b70fc36f2..638f9fb88a48 100644 --- a/dubbo-native-plugin/pom.xml +++ b/dubbo-native-plugin/pom.xml @@ -77,7 +77,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.13.0 + 3.13.1 dubbo 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 10/14] 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] 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 5cdf527a6d85..8deb6db0d67a 100644 --- a/dubbo-maven-plugin/pom.xml +++ b/dubbo-maven-plugin/pom.xml @@ -46,7 +46,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.13.0 + 3.13.1 provided diff --git a/dubbo-native-plugin/pom.xml b/dubbo-native-plugin/pom.xml index 638f9fb88a48..f0e6f80561e0 100644 --- a/dubbo-native-plugin/pom.xml +++ b/dubbo-native-plugin/pom.xml @@ -48,7 +48,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.13.0 + 3.13.1 provided 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 11/14] 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] 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 edb5063a0815..3df5deeab3ce 100644 --- a/pom.xml +++ b/pom.xml @@ -315,7 +315,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.3 + 3.6.0 false 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 12/14] 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] 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 3df5deeab3ce..61adbed1c8a1 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.8.2 3.13.0 3.3.1 - 3.6.3 + 3.7.0 9.4.54.v20240208 3.3.1 0.8.12 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 13/14] 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] 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 61adbed1c8a1..472134a92a07 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.3.1 0.8.12 1.6.0 - 3.4.1 + 3.5.0 3.1.0 1.7.1 0.6.1 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 14/14] 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 0178a5382c0f..e02649941808 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 e830246617a9..caef4385bf3d 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 0) {