SpringCloud/spring-cloud-zookeeper
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump curator.version from 5.7.1 to 5.8.0 (#359)

Browse Source 
* 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] <support@github.com>

* Fix test

* Formatting

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ryan Baxter <ryan.baxter@broadcom.com>
This commit is contained in:
dependabot[bot]
2025-04-10 15:31:25 -04:00
committed by GitHub
parent 217a91760b
commit f3c6111107
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-zookeeper-config/src/test/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataCustomizationIntegrationTests.java
View File

@@ -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 {

2
spring-cloud-zookeeper-dependencies/pom.xml
View File

@@ -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>