From 2a0bf2201afa7b57058b152f349ad3f00d67990f Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Tue, 1 Apr 2025 03:51:12 -0700
Subject: [PATCH 1/3] Update to Curator 5.8.0.

Follow-up to #16617. Among other things, this version of Curator fixes
bugs related to leader election: https://issues.apache.org/jira/browse/CURATOR-696
and https://issues.apache.org/jira/browse/CURATOR-724.

Hopefully fixes #17781.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b913fb973e5e..119d04266b12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
         <maven.compiler.release>${java.version}</maven.compiler.release>
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <aether.version>0.9.0.M2</aether.version>
-        <apache.curator.version>5.5.0</apache.curator.version>
+        <apache.curator.version>5.8.0</apache.curator.version>
         <apache.kafka.version>3.9.0</apache.kafka.version>
         <!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk
         and update as needed in extensions-core/druid-ranger-security/pm.xml  -->

From e385c0c000983e7bc8062fca65817a7c78296da7 Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Tue, 1 Apr 2025 10:00:10 -0700
Subject: [PATCH 2/3] Update licenses.yaml.

---
 licenses.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.yaml b/licenses.yaml
index 340768191c55..5e543a7153a9 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -1692,7 +1692,7 @@ name: Apache Curator
 license_category: binary
 module: java-core
 license_name: Apache License version 2.0
-version: 5.5.0
+version: 5.8.0
 libraries:
   - org.apache.curator: curator-client
   - org.apache.curator: curator-framework

From 37595c1701766150235e0074d72659a51c6af2b2 Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Tue, 1 Apr 2025 10:00:57 -0700
Subject: [PATCH 3/3] Additional variables.

---
 extensions-contrib/ddsketch/pom.xml | 2 +-
 integration-tests-ex/cases/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions-contrib/ddsketch/pom.xml b/extensions-contrib/ddsketch/pom.xml
index b2e7e59148a0..4cfe73eefbe6 100644
--- a/extensions-contrib/ddsketch/pom.xml
+++ b/extensions-contrib/ddsketch/pom.xml
@@ -128,7 +128,7 @@
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-client</artifactId>
-      <version>5.5.0</version>
+      <version>${apache.curator.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests-ex/cases/pom.xml b/integration-tests-ex/cases/pom.xml
index 1a565d5fb853..b6e2e916ea2d 100644
--- a/integration-tests-ex/cases/pom.xml
+++ b/integration-tests-ex/cases/pom.xml
@@ -298,7 +298,7 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
-            <version>5.5.0</version>
+            <version>${apache.curator.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>