Bump jetcd from 0.5.0 to 0.7.7 (#3849)

Signed-off-by: ZhangJian He <shoothzj@gmail.com>
apache · May 16, 2024 · be65a8a · be65a8a
1 parent 6ea81a6
commit be65a8a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 50 deletions.
diff --git a/...n/java/io/etcd/jetcd/EtcdClientUtils.java → ...a/io/etcd/jetcd/impl/EtcdClientUtils.java b/...n/java/io/etcd/jetcd/EtcdClientUtils.java → ...a/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/.../io/etcd/jetcd/EtcdConnectionManager.java → ...tcd/jetcd/impl/EtcdConnectionManager.java b/.../io/etcd/jetcd/EtcdConnectionManager.java → ...tcd/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/...main/java/io/etcd/jetcd/package-info.java → ...java/io/etcd/jetcd/impl/package-info.java b/...main/java/io/etcd/jetcd/package-info.java → ...java/io/etcd/jetcd/impl/package-info.java
@@ -19,4 +19,4 @@
 /**
  * Etcd client changes for bookkeeper metadata driver.
  */
-package io.etcd.jetcd;
+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
@@ -27,7 +27,6 @@
 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.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
@@ -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
@@ -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><![CDATA[
@@ -243,4 +199,4 @@
     <sha1>1416a607fae667c14e390b484e8d02b5824c0674</sha1>
     <vulnerabilityName>CVE-2022-4065</vulnerabilityName>
   </suppress>
-</suppressions>
+</suppressions>