This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new be65a8abc9 Bump jetcd from 0.5.0 to 0.7.7 (#3849)
be65a8abc9 is described below
commit be65a8abc9d7d0c8e64f5d5e16f0a75f1b6b94a3
Author: ZhangJian He <[email protected]>
AuthorDate: Thu May 16 09:56:41 2024 +0800
Bump jetcd from 0.5.0 to 0.7.7 (#3849)
Signed-off-by: ZhangJian He <[email protected]>
---
.../io/etcd/jetcd/{ => impl}/EtcdClientUtils.java | 2 +-
.../jetcd/{ => impl}/EtcdConnectionManager.java | 3 +-
.../io/etcd/jetcd/{ => impl}/package-info.java | 2 +-
.../bookkeeper/metadata/etcd/EtcdWatchClient.java | 2 +-
pom.xml | 2 +-
src/owasp-dependency-check-suppressions.xml | 46 +---------------------
6 files changed, 7 insertions(+), 50 deletions(-)
diff --git
a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java
b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java
similarity index 97%
rename from
metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java
rename to
metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java
index f696e19cc3..4c74cc9c4f 100644
--- a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java
+++
b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package io.etcd.jetcd;
+package io.etcd.jetcd.impl;
import java.lang.reflect.Field;
diff --git
a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java
b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java
similarity index 97%
rename from
metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java
rename to
metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java
index 52b5199f43..db090135c9 100644
---
a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java
+++
b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package io.etcd.jetcd;
+package io.etcd.jetcd.impl;
+import io.etcd.jetcd.Client;
import io.etcd.jetcd.api.WatchGrpc;
import lombok.extern.slf4j.Slf4j;
diff --git
a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java
b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java
similarity index 96%
rename from metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java
rename to
metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java
index 77ce69ff43..7cc4a43579 100644
--- a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java
+++ b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java
@@ -19,4 +19,4 @@
/**
* Etcd client changes for bookkeeper metadata driver.
*/
-package io.etcd.jetcd;
\ No newline at end of file
+package io.etcd.jetcd.impl;
diff --git
a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
index fcb72126e2..6a046ba4e2 100644
---
a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
+++
b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
@@ -27,7 +27,6 @@ import com.google.protobuf.ByteString;
import com.google.protobuf.UnsafeByteOperations;
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
-import io.etcd.jetcd.EtcdConnectionManager;
import io.etcd.jetcd.api.WatchCancelRequest;
import io.etcd.jetcd.api.WatchCreateRequest;
import io.etcd.jetcd.api.WatchGrpc;
@@ -36,6 +35,7 @@ import io.etcd.jetcd.api.WatchResponse;
import io.etcd.jetcd.common.exception.ErrorCode;
import io.etcd.jetcd.common.exception.EtcdException;
import io.etcd.jetcd.common.exception.EtcdExceptionFactory;
+import io.etcd.jetcd.impl.EtcdConnectionManager;
import io.etcd.jetcd.options.WatchOption;
import io.etcd.jetcd.watch.WatchResponseWithError;
import io.grpc.Status;
diff --git a/pom.xml b/pom.xml
index 001d8f0aea..a58c6cdd51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
<curator.version>5.1.0</curator.version>
<disruptor.version>4.0.0</disruptor.version>
<dropwizard.version>4.1.12.1</dropwizard.version>
- <etcd.version>0.5.11</etcd.version>
+ <etcd.version>0.7.7</etcd.version>
<freebuilder.version>2.8.0</freebuilder.version>
<google.code.version>3.0.2</google.code.version>
<google.errorprone.version>2.9.0</google.errorprone.version>
diff --git a/src/owasp-dependency-check-suppressions.xml
b/src/owasp-dependency-check-suppressions.xml
index 6ffecf176c..ef8dd4e960 100644
--- a/src/owasp-dependency-check-suppressions.xml
+++ b/src/owasp-dependency-check-suppressions.xml
@@ -22,50 +22,6 @@
<suppressions
xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd";>
<!-- add supressions for known vulnerabilities detected by OWASP
Dependency Check -->
- <!-- jetcd matched against ETCD server CVEs-->
- <suppress>
- <notes><![CDATA[
- file name: jetcd-core-0.5.11.jar
- ]]></notes>
- <sha1>c85851ca3ea8128d480d3f75c568a37e64e8a77b</sha1>
- <cve>CVE-2020-15106</cve>
- </suppress>
- <suppress>
- <notes><![CDATA[
- file name: jetcd-core-0.5.11.jar
- ]]></notes>
- <sha1>c85851ca3ea8128d480d3f75c568a37e64e8a77b</sha1>
- <cve>CVE-2020-15112</cve>
- </suppress>
- <suppress>
- <notes><![CDATA[
- file name: jetcd-core-0.5.11.jar
- ]]></notes>
- <sha1>c85851ca3ea8128d480d3f75c568a37e64e8a77b</sha1>
- <cve>CVE-2020-15113</cve>
- </suppress>
-
- <suppress>
- <notes><![CDATA[
- file name: jetcd-common-0.5.11.jar
- ]]></notes>
- <sha1>6dac6efe035a2be9ba299fbf31be5f903401869f</sha1>
- <cve>CVE-2020-15106</cve>
- </suppress>
- <suppress>
- <notes><![CDATA[
- file name: jetcd-common-0.5.11.jar
- ]]></notes>
- <sha1>6dac6efe035a2be9ba299fbf31be5f903401869f</sha1>
- <cve>CVE-2020-15112</cve>
- </suppress>
- <suppress>
- <notes><![CDATA[
- file name: jetcd-common-0.5.11.jar
- ]]></notes>
- <sha1>6dac6efe035a2be9ba299fbf31be5f903401869f</sha1>
- <cve>CVE-2020-15113</cve>
- </suppress>
<!-- matches BK's http server against apache's http server CVEs -->
<suppress>
<notes><