This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new c21722c6062 Bump curator version
c21722c6062 is described below
commit c21722c60620a9e560fbb968f6da7ad6c03828d7
Author: Croway <[email protected]>
AuthorDate: Tue Feb 7 13:40:29 2023 +0100
Bump curator version
---
camel-dependencies/pom.xml | 2 +-
.../component/zookeepermaster/group/internal/ZooKeeperGroup.java | 7 +++----
parent/pom.xml | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 5b66ad0ac30..b549ee9cdb9 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -126,7 +126,7 @@
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<corda-version>4.10</corda-version>
<couchbase-client-version>3.4.2</couchbase-client-version>
- <curator-version>4.3.0</curator-version>
+ <curator-version>5.4.0</curator-version>
<cxf-version>4.0.0</cxf-version>
<cxf-codegen-plugin-version>4.0.0</cxf-codegen-plugin-version>
<!-- cxf-xjc is not released as often -->
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
index 2041a2d897b..124b88dd037 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroup.java
@@ -48,7 +48,7 @@ import org.apache.camel.component.zookeepermaster.group.Group;
import org.apache.camel.component.zookeepermaster.group.GroupListener;
import org.apache.camel.component.zookeepermaster.group.NodeState;
import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.listen.ListenerContainer;
+import org.apache.curator.framework.listen.StandardListenerManager;
import org.apache.curator.framework.state.ConnectionState;
import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.curator.utils.EnsurePath;
@@ -85,7 +85,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
private final ExecutorService executorService;
private final EnsurePath ensurePath;
private final BlockingQueue<Operation> operations = new
LinkedBlockingQueue<>();
- private final ListenerContainer<GroupListener<T>> listeners = new
ListenerContainer<>();
+ private final StandardListenerManager<GroupListener<T>> listeners =
StandardListenerManager.standard();
private final ConcurrentMap<String, ChildData<T>> currentData = new
ConcurrentHashMap<>();
private final AtomicBoolean started = new AtomicBoolean();
private final AtomicBoolean connected = new AtomicBoolean();
@@ -396,7 +396,7 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
*
* @return listenable
*/
- public ListenerContainer<GroupListener<T>> getListenable() {
+ public StandardListenerManager<GroupListener<T>> getListenable() {
return listeners;
}
@@ -491,7 +491,6 @@ public class ZooKeeperGroup<T extends NodeState> implements
Group<T> {
} catch (Exception e) {
handleException(e);
}
- return null;
});
}
diff --git a/parent/pom.xml b/parent/pom.xml
index c42e4840e0a..c441c9a08d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -121,7 +121,7 @@
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<corda-version>4.10</corda-version>
<couchbase-client-version>3.4.2</couchbase-client-version>
- <curator-version>4.3.0</curator-version>
+ <curator-version>5.4.0</curator-version>
<cxf-version>4.0.0</cxf-version>
<cxf-codegen-plugin-version>4.0.0</cxf-codegen-plugin-version>
<!-- cxf-xjc is not released as often -->
