From bfedc9bc0ef9482b54c6924895a3940bd0df933c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 21:15:12 +0800 Subject: [PATCH 1/4] Bump grpc.version from 1.61.1 to 1.62.2 (#13820) Bumps `grpc.version` from 1.61.1 to 1.62.2. Updates `io.grpc:grpc-core` from 1.61.1 to 1.62.2 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.61.1...v1.62.2) Updates `io.grpc:grpc-stub` from 1.61.1 to 1.62.2 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.61.1...v1.62.2) Updates `io.grpc:grpc-protobuf` from 1.61.1 to 1.62.2 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.61.1...v1.62.2) Updates `io.grpc:grpc-context` from 1.61.1 to 1.62.2 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.61.1...v1.62.2) Updates `io.grpc:grpc-netty-shaded` from 1.61.1 to 1.62.2 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.61.1...v1.62.2) Updates `io.grpc:grpc-netty` from 1.61.1 to 1.62.2 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.61.1...v1.62.2) Updates `io.grpc:grpc-grpclb` from 1.61.1 to 1.62.2 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.61.1...v1.62.2) --- updated-dependencies: - dependency-name: io.grpc:grpc-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.grpc:grpc-stub dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.grpc:grpc-protobuf dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.grpc:grpc-context dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.grpc:grpc-netty-shaded dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.grpc:grpc-netty dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.grpc:grpc-grpclb 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> --- 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 d5221fbc7d..41e62d8200 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -134,7 +134,7 @@ 1.9.13 8.5.99 2.2.4 - 1.61.1 + 1.62.2 0.8.1 1.2.2 From ea8cdc65247d0119234d371595cc385d66ccd696 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 21:15:34 +0800 Subject: [PATCH 2/4] Bump ch.qos.logback:logback-core from 1.5.0 to 1.5.2 (#13819) Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.5.0 to 1.5.2. - [Commits](https://github.com/qos-ch/logback/commits) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core 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-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml index b17ae406bc..239a0a93ea 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml @@ -184,7 +184,7 @@ ch.qos.logback logback-core - 1.5.0 + 1.5.2 compile diff --git a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml index 2267b7fa66..a6f47e833c 100644 --- a/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml @@ -181,7 +181,7 @@ ch.qos.logback logback-core - 1.5.0 + 1.5.2 compile From 44c7f7967f931ee28791665f5c683dfac711c1ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:03:02 +0800 Subject: [PATCH 3/4] Bump com.alibaba.nacos:nacos-client from 2.2.4 to 2.3.1 (#13821) * Bump com.alibaba.nacos:nacos-client from 2.2.4 to 2.3.1 Bumps [com.alibaba.nacos:nacos-client](https://github.com/alibaba/nacos) from 2.2.4 to 2.3.1. - [Release notes](https://github.com/alibaba/nacos/releases) - [Changelog](https://github.com/alibaba/nacos/blob/develop/CHANGELOG.md) - [Commits](https://github.com/alibaba/nacos/compare/2.2.4...2.3.1) --- updated-dependencies: - dependency-name: com.alibaba.nacos:nacos-client dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Fix compile * Fix format --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Albumen Kevin --- .../dubbo/configcenter/support/nacos/MockConfigService.java | 4 ++++ dubbo-dependencies-bom/pom.xml | 2 +- .../apache/dubbo/metadata/store/nacos/MockConfigService.java | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/MockConfigService.java b/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/MockConfigService.java index 399401865a..7748c80b8e 100644 --- a/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/MockConfigService.java +++ b/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/MockConfigService.java @@ -17,6 +17,7 @@ package org.apache.dubbo.configcenter.support.nacos; import com.alibaba.nacos.api.config.ConfigService; +import com.alibaba.nacos.api.config.filter.IConfigFilter; import com.alibaba.nacos.api.config.listener.Listener; import com.alibaba.nacos.api.exception.NacosException; @@ -71,4 +72,7 @@ public class MockConfigService implements ConfigService { @Override public void shutDown() throws NacosException {} + + @Override + public void addConfigFilter(IConfigFilter iConfigFilter) {} } diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 41e62d8200..92f13e2b17 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -133,7 +133,7 @@ 3.15.6.Final 1.9.13 8.5.99 - 2.2.4 + 2.3.1 1.62.2 0.8.1 1.2.2 diff --git a/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/MockConfigService.java b/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/MockConfigService.java index e362a88a5f..86e13c556e 100644 --- a/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/MockConfigService.java +++ b/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/MockConfigService.java @@ -17,6 +17,7 @@ package org.apache.dubbo.metadata.store.nacos; import com.alibaba.nacos.api.config.ConfigService; +import com.alibaba.nacos.api.config.filter.IConfigFilter; import com.alibaba.nacos.api.config.listener.Listener; import com.alibaba.nacos.api.exception.NacosException; @@ -69,4 +70,7 @@ public class MockConfigService implements ConfigService { @Override public void shutDown() {} + + @Override + public void addConfigFilter(IConfigFilter iConfigFilter) {} } From cfd6ebe61195f203aa1ec3184007b12026e23bbb Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Wed, 6 Mar 2024 11:10:26 +0800 Subject: [PATCH 4/4] Update zookeeper version --- .github/workflows/build-and-test-pr.yml | 8 ++++---- .github/workflows/build-and-test-scheduled-3.1.yml | 8 ++++---- .github/workflows/build-and-test-scheduled-3.2.yml | 8 ++++---- .github/workflows/build-and-test-scheduled-3.3.yml | 8 ++++---- .github/workflows/release-test.yml | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 921277362a..8260cc6abd 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -579,10 +579,10 @@ jobs: - name: "Setup Zookeeper environment" run: | - wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.3/apache-zookeeper-3.8.3-bin.tar.gz - tar -zxvf apache-zookeeper-3.8.3-bin.tar.gz - mv apache-zookeeper-3.8.3-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.3-bin/conf/zoo.cfg - apache-zookeeper-3.8.3-bin/bin/zkServer.sh start + wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz + tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz + mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg + apache-zookeeper-3.8.4-bin/bin/zkServer.sh start - name: "Check environment" run: | diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index aeacdc9cdf..54a2abda85 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -477,10 +477,10 @@ jobs: - name: "Setup Zookeeper environment" run: | - wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.3/apache-zookeeper-3.8.3-bin.tar.gz - tar -zxvf apache-zookeeper-3.8.3-bin.tar.gz - mv apache-zookeeper-3.8.3-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.3-bin/conf/zoo.cfg - apache-zookeeper-3.8.3-bin/bin/zkServer.sh start + wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz + tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz + mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg + apache-zookeeper-3.8.4-bin/bin/zkServer.sh start - name: "Check environment" run: | diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index a7a8b21663..e3b3d95c8d 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -477,10 +477,10 @@ jobs: - name: "Setup Zookeeper environment" run: | - wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.3/apache-zookeeper-3.8.3-bin.tar.gz - tar -zxvf apache-zookeeper-3.8.3-bin.tar.gz - mv apache-zookeeper-3.8.3-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.3-bin/conf/zoo.cfg - apache-zookeeper-3.8.3-bin/bin/zkServer.sh start + wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz + tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz + mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg + apache-zookeeper-3.8.4-bin/bin/zkServer.sh start - name: "Check environment" run: | diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml index 8c41bf3a56..2ba459be6a 100644 --- a/.github/workflows/build-and-test-scheduled-3.3.yml +++ b/.github/workflows/build-and-test-scheduled-3.3.yml @@ -477,10 +477,10 @@ jobs: - name: "Setup Zookeeper environment" run: | - wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.3/apache-zookeeper-3.8.3-bin.tar.gz - tar -zxvf apache-zookeeper-3.8.3-bin.tar.gz - mv apache-zookeeper-3.8.3-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.3-bin/conf/zoo.cfg - apache-zookeeper-3.8.3-bin/bin/zkServer.sh start + wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz + tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz + mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg + apache-zookeeper-3.8.4-bin/bin/zkServer.sh start - name: "Check environment" run: | diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index a0250eec9c..48131fda3c 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -472,10 +472,10 @@ jobs: - name: "Setup Zookeeper environment" run: | - wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.3/apache-zookeeper-3.8.3-bin.tar.gz - tar -zxvf apache-zookeeper-3.8.3-bin.tar.gz - mv apache-zookeeper-3.8.3-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.3-bin/conf/zoo.cfg - apache-zookeeper-3.8.3-bin/bin/zkServer.sh start + wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz + tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz + mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg + apache-zookeeper-3.8.4-bin/bin/zkServer.sh start - name: "Check environment" run: |