Skip to content

Bump curator.version from 5.7.1 to 5.8.0 #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanjbaxter merged 3 commits into from
Apr 10, 2025
+8 −16
Merged

Bump curator.version from 5.7.1 to 5.8.0 #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a17977f
Bump curator.version from 5.7.1 to 5.8.0
dependabot[bot] Apr 10, 2025
dab0a63
Fix test
ryanjbaxter Apr 10, 2025
1d05939
Formatting
ryanjbaxter Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions ...ingframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
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;
Expand Down Expand Up @@ -51,13 +50,10 @@
*/
public class ZookeeperConfigDataCustomizationIntegrationTests {

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 static final Log log = LogFactory
.getLog(ZookeeperConfigDataCustomizationIntegrationTests.class);
private ConfigurableApplicationContext context;
private BindHandlerBootstrapper bindHandlerBootstrapper;

Expand Down Expand Up @@ -86,8 +82,9 @@ CuratorFramework curatorFramework(BootstrapContext context) {
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(),
Expand All @@ -102,16 +99,11 @@ CuratorFramework curatorFramework(BootstrapContext context) {
@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 {
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-zookeeper-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>spring-cloud-zookeeper-dependencies</name>
<description>Spring Cloud Zookeeper Dependencies</description>
<properties>
<curator.version>5.7.1</curator.version>
<curator.version>5.8.0</curator.version>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>
Expand Down