This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.16 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit f190b6af60c33e209e2f369cf9c7e9d448e6d4b2 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]> (cherry picked from commit be65a8abc9d7d0c8e64f5d5e16f0a75f1b6b94a3) --- .../src/main/java/io/etcd/jetcd/{ => impl}/EtcdClientUtils.java | 2 +- .../main/java/io/etcd/jetcd/{ => impl}/EtcdConnectionManager.java | 3 ++- .../etcd/src/main/java/io/etcd/jetcd/{ => impl}/package-info.java | 2 +- .../java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java | 2 +- pom.xml | 2 +- src/owasp-dependency-check-suppressions.xml | 6 ------ 6 files changed, 6 insertions(+), 11 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 26b10552d9..0026c30571 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ <bouncycastle.version>1.0.2.4</bouncycastle.version> <curator.version>5.1.0</curator.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 d49a9fae24..0e1564cfae 100644 --- a/src/owasp-dependency-check-suppressions.xml +++ b/src/owasp-dependency-check-suppressions.xml @@ -21,13 +21,7 @@ --> <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd";> <!-- add suppressions for known vulnerabilities detected by OWASP Dependency Check --> - <!-- jetcd higher version requires jdk 11 --> - <suppress> - <notes>CVE-2020-15113</notes> - <filePath regex="true">.*jetcd.*\.jar</filePath> - <cve>CVE-2020-15113</cve> - </suppress> <suppress> <notes><