diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 885933f655..0c85032f64 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 30a62d3f17..07339cb4a0 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: | 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-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml b/dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml index eaf9f278b5..daa9dbb49d 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 @@ -157,7 +157,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 5bbb8fe126..7602af3581 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 @@ -157,7 +157,7 @@ ch.qos.logback logback-core - 1.5.0 + 1.5.2 compile diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 3cee586edc..9cf94d697f 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -134,10 +134,10 @@ 3.15.6.Final 1.9.13 8.5.99 - 2.2.4 + 2.3.1 1.8.6 1.6.1 - 1.61.1 + 1.62.2 0.8.1 1.2.2 0.9.10 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) {} }