revert jetcd

dist-material/release-docs/LICENSE

@@ -227,6 +227,7 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-kotlin/2.13.4 Apache-2.0
     https://mvnrepository.com/artifact/com.fasterxml/classmate/1.5.1 Apache-2.0
     https://mvnrepository.com/artifact/com.google.api.grpc/proto-google-common-protos/2.41.0 Apache-2.0
+    https://mvnrepository.com/artifact/com.google.auto.service/auto-service-annotations/1.0.1 Apache-2.0
     https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305/3.0.2 Apache-2.0
     https://mvnrepository.com/artifact/com.google.code.gson/gson/2.9.0 Apache-2.0
     https://mvnrepository.com/artifact/com.google.errorprone/error_prone_annotations/2.11.0 Apache-2.0
@@ -255,12 +256,11 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/commons-net/commons-net/3.9.0 Apache-2.0
     https://mvnrepository.com/artifact/commons-validator/commons-validator/1.7 Apache-2.0
     https://npmjs.com/package/d3-flame-graph/v/4.1.3 4.1.3 Apache-2.0
-    https://mvnrepository.com/artifact/dev.failsafe/failsafe/3.3.2 Apache-2.0
     https://npmjs.com/package/echarts/v/5.4.1 5.4.1 Apache-2.0
-    https://mvnrepository.com/artifact/io.etcd/jetcd-api/0.8.3 Apache-2.0
-    https://mvnrepository.com/artifact/io.etcd/jetcd-common/0.8.3 Apache-2.0
-    https://mvnrepository.com/artifact/io.etcd/jetcd-core/0.8.3 Apache-2.0
-    https://mvnrepository.com/artifact/io.etcd/jetcd-grpc/0.8.3 Apache-2.0
+    https://mvnrepository.com/artifact/io.etcd/jetcd-api/0.6.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.etcd/jetcd-common/0.6.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.etcd/jetcd-core/0.6.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.etcd/jetcd-grpc/0.6.1 Apache-2.0
     https://mvnrepository.com/artifact/io.fabric8/istio-client/6.7.1 Apache-2.0
     https://mvnrepository.com/artifact/io.fabric8/istio-model-v1alpha3/6.7.1 Apache-2.0
     https://mvnrepository.com/artifact/io.fabric8/istio-model-v1beta1/6.7.1 Apache-2.0
@@ -335,6 +335,7 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/io.zipkin/zipkin-lens/2.24.1 Apache-2.0
     https://mvnrepository.com/artifact/javax.inject/javax.inject/1 Apache-2.0
     https://mvnrepository.com/artifact/joda-time/joda-time/2.10.5 Apache-2.0
+    https://mvnrepository.com/artifact/net.jodah/failsafe/2.4.4 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.commons/commons-lang3/3.12.0 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.commons/commons-text/1.4 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.curator/curator-client/4.3.0 Apache-2.0
@@ -372,14 +373,6 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/org.yaml/snakeyaml/2.0 Apache-2.0
     https://npmjs.com/package/typescript/v/4.7.4 4.7.4 Apache-2.0
 
-========================================================================
-Apache-2.0 and http://www.eclipse.org/legal/epl-v20.html licenses
-========================================================================
-The following components are provided under the Apache-2.0 and http://www.eclipse.org/legal/epl-v20.html License. See project link for details.
-The text of each license is also included in licenses/LICENSE-[project].txt.
-
-    https://mvnrepository.com/artifact/io.vertx/vertx-core/4.5.9 Apache-2.0 and http://www.eclipse.org/legal/epl-v20.html
-
 ========================================================================
 BSD-2-Clause licenses
 ========================================================================
@@ -422,14 +415,6 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
 
     https://mvnrepository.com/artifact/org.hdrhistogram/HdrHistogram/2.2.1 CC0-1.0 and BSD-2-Clause
 
-========================================================================
-EPL-2.0 licenses
-========================================================================
-The following components are provided under the EPL-2.0 License. See project link for details.
-The text of each license is also included in licenses/LICENSE-[project].txt.
-
-    https://mvnrepository.com/artifact/io.vertx/vertx-grpc/4.5.9 EPL-2.0
-
 ========================================================================
 ISC licenses
 ========================================================================

docs/en/changes/changes.md

@@ -20,7 +20,7 @@
 * Fix "BanyanDBTraceQueryDAO.queryBasicTraces" doesn't support querying by "trace_id".
 * Polish mesh data dispatcher: don't generate Instance/Endpoint metrics if they are empty.
 * Adapt the new metadata standardization in Istio 1.24.
-* Bump up netty to 4.1.115, grpc to 1.68.1, boringssl to 2.0.69, jetcd to 0.8.3.
+* Bump up netty to 4.1.115, grpc to 1.68.1, boringssl to 2.0.69.
 
 #### UI
 

oap-server-bom/pom.xml

@@ -66,7 +66,7 @@
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <flatbuffers-java.version>1.12.0</flatbuffers-java.version>
         <postgresql.version>42.4.4</postgresql.version>
-        <jetcd.version>0.8.3</jetcd.version>
+        <jetcd.version>0.6.1</jetcd.version>
         <testcontainers.version>1.17.6</testcontainers.version>
         <armeria.version>1.29.3</armeria.version>
         <awaitility.version>3.0.0</awaitility.version>

test/e2e-v2/script/docker-compose/base-compose.yml

@@ -34,8 +34,8 @@ services:
       SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest?allowMultiQueries=true
       SW_STORAGE_BANYANDB_TARGETS: banyandb:17912
       SW_CONFIG_ETCD_PERIOD: 1
-      SW_CONFIG_ETCD_ENDPOINTS: http://etcd:2379
-      SW_CLUSTER_ETCD_ENDPOINTS: http://etcd:2379
+      SW_CONFIG_ETCD_ENDPOINTS: etcd:2379
+      SW_CLUSTER_ETCD_ENDPOINTS: etcd:2379
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"]
       interval: 5s