From f3c61111073b22c7280690b0e3a30ccd62470305 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 15:31:25 -0400 Subject: [PATCH] Bump curator.version from 5.7.1 to 5.8.0 (#359) * Bump curator.version from 5.7.1 to 5.8.0 Bumps `curator.version` from 5.7.1 to 5.8.0. Updates `org.apache.curator:curator-framework` from 5.7.1 to 5.8.0 - [Release notes](https://github.com/apache/curator/releases) - [Commits](https://github.com/apache/curator/compare/apache-curator-5.7.1...apache-curator-5.8.0) Updates `org.apache.curator:curator-recipes` from 5.7.1 to 5.8.0 - [Release notes](https://github.com/apache/curator/releases) - [Commits](https://github.com/apache/curator/compare/apache-curator-5.7.1...apache-curator-5.8.0) Updates `org.apache.curator:curator-x-discovery` from 5.7.1 to 5.8.0 - [Release notes](https://github.com/apache/curator/releases) - [Commits](https://github.com/apache/curator/compare/apache-curator-5.7.1...apache-curator-5.8.0) Updates `org.apache.curator:curator-test` from 5.7.1 to 5.8.0 - [Release notes](https://github.com/apache/curator/releases) - [Commits](https://github.com/apache/curator/compare/apache-curator-5.7.1...apache-curator-5.8.0) --- updated-dependencies: - dependency-name: org.apache.curator:curator-framework dependency-version: 5.8.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.curator:curator-recipes dependency-version: 5.8.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.curator:curator-x-discovery dependency-version: 5.8.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.curator:curator-test dependency-version: 5.8.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Fix test * Formatting --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan Baxter --- ...nfigDataCustomizationIntegrationTests.java | 22 ++++++------------- spring-cloud-zookeeper-dependencies/pom.xml | 2 +- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java index 7e916eac..fae1ceec 100644 --- a/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java +++ b/spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java @@ -22,7 +22,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; -import org.apache.curator.framework.imps.CuratorFrameworkImpl; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -51,13 +50,10 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class ZookeeperConfigDataCustomizationIntegrationTests { + public static final String PREFIX = "test__configdata__"; + public static final String ROOT = "/" + PREFIX + UUID.randomUUID(); private static final Log log = LogFactory .getLog(ZookeeperConfigDataCustomizationIntegrationTests.class); - - public static final String PREFIX = "test__configdata__"; - - public static final String ROOT = "/" + PREFIX + UUID.randomUUID(); - private ConfigurableApplicationContext context; private BindHandlerBootstrapper bindHandlerBootstrapper; @@ -86,8 +82,9 @@ public class ZookeeperConfigDataCustomizationIntegrationTests { ZookeeperProperties properties = context.get(ZookeeperProperties.class); CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder() .retryPolicy(CuratorFactory.retryPolicy(properties)) - .connectString(properties.getConnectString()); - TestCuratorFramework curator = new TestCuratorFramework(builder); + .connectString(properties.getConnectString()) + .namespace("testnamespace"); + CuratorFramework curator = builder.build(); curator.start(); try { curator.blockUntilConnected(properties.getBlockUntilConnectedWait(), @@ -102,16 +99,11 @@ public class ZookeeperConfigDataCustomizationIntegrationTests { @Test public void curatorFrameworkIsCustom() { CuratorFramework curator = context.getBean(CuratorFramework.class); - assertThat(curator).isNotNull().isInstanceOf(TestCuratorFramework.class); + assertThat(curator).isNotNull(); + assertThat(curator.getNamespace()).isEqualTo("testnamespace"); assertThat(bindHandlerBootstrapper.onSuccessCount).isGreaterThan(0); } - static class TestCuratorFramework extends CuratorFrameworkImpl { - TestCuratorFramework(CuratorFrameworkFactory.Builder builder) { - super(builder); - } - } - @Configuration @EnableAutoConfiguration static class Config { diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index d516a071..77edafd1 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -14,7 +14,7 @@ spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies - 5.7.1 + 5.8.0 true true true