From cee2dfd768eb257820e4019986be0a98fa62b44a Mon Sep 17 00:00:00 2001
From: Benedict Jin <asdf2014@apache.org>
Date: Wed, 15 Mar 2023 21:51:09 +0800
Subject: [PATCH] Upgrade ZK from 3.5.9 to 3.5.10 to avoid data inconsistency
 risk (#13715)

---
 distribution/docker/docker-compose.yml | 2 +-
 licenses.yaml                          | 2 +-
 pom.xml                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/distribution/docker/docker-compose.yml b/distribution/docker/docker-compose.yml
index af7e47b3d4b..1b7c2e05c6b 100644
--- a/distribution/docker/docker-compose.yml
+++ b/distribution/docker/docker-compose.yml
@@ -44,7 +44,7 @@ services:
   # Need 3.5 or later for container nodes
   zookeeper:
     container_name: zookeeper
-    image: zookeeper:3.5
+    image: zookeeper:3.5.10
     ports:
       - "2181:2181"
     environment:
diff --git a/licenses.yaml b/licenses.yaml
index 6c9e4a6e49c..6b121c715a5 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -1963,7 +1963,7 @@ name: Apache Zookeeper
 license_category: binary
 module: java-core
 license_name: Apache License version 2.0
-version: 3.5.9
+version: 3.5.10
 libraries:
   - org.apache.zookeeper: zookeeper
   - org.apache.zookeeper: zookeeper-jute
diff --git a/pom.xml b/pom.xml
index 63333a36a77..c6766d6acef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
         <hibernate-validator.version>5.2.5.Final</hibernate-validator.version>
         <httpclient.version>4.5.13</httpclient.version>
         <!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) -->
-        <zookeeper.version>3.5.9</zookeeper.version>
+        <zookeeper.version>3.5.10</zookeeper.version>
         <checkerframework.version>2.5.7</checkerframework.version>
         <com.google.apis.client.version>1.26.0</com.google.apis.client.version>
         <com.google.apis.compute.version>v1-rev20190607-${com.google.apis.client.version}</com.google.apis.compute.version>