This is an automated email from the ASF dual-hosted git repository.
abhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 326b7b731dd Upgrade zookeeper from 3.5.10 to 3.8.3 (#15477)
326b7b731dd is described below
commit 326b7b731dd9c068645fd918571b52f46782a61b
Author: Vishesh Garg <[email protected]>
AuthorDate: Tue Dec 5 18:57:56 2023 +0530
Upgrade zookeeper from 3.5.10 to 3.8.3 (#15477)
Upgrade zookeeper from 3.5.10 to 3.8.3
---
licenses.yaml | 17 +++++++++++++++--
owasp-dependency-check-suppressions.xml | 2 +-
pom.xml | 10 +++++++++-
server/pom.xml | 7 +++++++
4 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/licenses.yaml b/licenses.yaml
index 50fc89b7c61..a1cdb0e09df 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -1871,14 +1871,14 @@ name: Apache Zookeeper
license_category: binary
module: java-core
license_name: Apache License version 2.0
-version: 3.5.10
+version: 3.8.3
libraries:
- org.apache.zookeeper: zookeeper
- org.apache.zookeeper: zookeeper-jute
notices:
- zookeeper: |
Apache ZooKeeper
- Copyright 2009-2019 The Apache Software Foundation
+ Copyright 2009-2023 The Apache Software Foundation
---
@@ -5459,6 +5459,19 @@ license_file_path: licenses/bin/lodash.MIT
---
+name: "audience-annotations"
+license_category: binary
+module: core
+license_name: Apache License version 2.0
+version: 0.12.0
+libraries:
+ - org.apache.yetus: audience-annotations
+notices:
+ - audience-annotations: |
+ Apache Yetus
+ Copyright 2008-2022 The Apache Software Foundation
+---
+
name: "loose-envify"
license_category: binary
module: web-console
diff --git a/owasp-dependency-check-suppressions.xml
b/owasp-dependency-check-suppressions.xml
index 421cb9df6ef..f9c3146e358 100644
--- a/owasp-dependency-check-suppressions.xml
+++ b/owasp-dependency-check-suppressions.xml
@@ -468,7 +468,7 @@
-->
<suppress>
<notes><![CDATA[
- file name: zookeeper-3.5.10.jar
+ file name: zookeeper-3.8.3.jar
]]></notes>
<cve>CVE-2023-44981</cve>
</suppress>
diff --git a/pom.xml b/pom.xml
index b585a69b4be..b8a503f7c57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
<hibernate-validator.version>6.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.10</zookeeper.version>
+ <zookeeper.version>3.8.3</zookeeper.version>
<checkerframework.version>2.5.7</checkerframework.version>
<com.google.apis.client.version>2.2.0</com.google.apis.client.version>
<com.google.http.client.apis.version>1.42.3</com.google.http.client.apis.version>
@@ -437,6 +437,14 @@
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/server/pom.xml b/server/pom.xml
index df5644a817d..6b0ef65f06d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -67,6 +67,11 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
@@ -471,6 +476,8 @@
<usedDependencies>
<!-- These are needed for scope: compile -->
<dependency>io.tesla.aether:tesla-aether</dependency>
+ <!-- These are needed for scope: runtime -->
+ <dependency>org.xerial.snappy:snappy-java</dependency>
</usedDependencies>
</configuration>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
