This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 35caa9791e Use maven.compiler.release and bump BanyanDB e2e commit
(#13754)
35caa9791e is described below
commit 35caa9791ea6b36a7b6a2c14343b7eda17353532
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Mon Mar 23 13:40:25 2026 +0800
Use maven.compiler.release and bump BanyanDB e2e commit (#13754)
* Use maven.compiler.release instead of source/target and bump BanyanDB e2e
commit
- Replace maven.compiler.source and maven.compiler.target with
maven.compiler.release=11 in root pom.xml. This ensures the compiler
also validates against JDK 11 API surface (boot classpath enforcement).
- Remove redundant compiler and encoding properties from
library-pprof-parser/pom.xml since they are inherited from the parent.
- Bump SW_BANYANDB_COMMIT to latest main (3c0e3a78).
---
.github/workflows/skywalking.yaml | 4 ++--
.../server-library/library-pprof-parser/pom.xml | 3 ---
pom.xml | 3 +--
.../storage/banyandb/stages/docker-compose.yml | 21 +++++++++----------
.../cases/storage/banyandb/stages/nodes.yaml | 24 ++++++++++++++++++++++
test/e2e-v2/script/env | 2 +-
6 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index eeb41da645..f65c5afa7c 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -345,9 +345,9 @@ jobs:
fail-fast: false
matrix:
test:
- - name: Cluster ZK/ES
+ - name: Cluster ZK ES
config: test/e2e-v2/cases/cluster/zk/es/e2e.yaml
- - name: Cluster ZK/BanyanDB
+ - name: Cluster ZK BanyanDB
config: test/e2e-v2/cases/cluster/zk/banyandb/e2e.yaml
- name: Agent NodeJS Backend
diff --git a/oap-server/server-library/library-pprof-parser/pom.xml
b/oap-server/server-library/library-pprof-parser/pom.xml
index 25a549747e..456b93c6b3 100755
--- a/oap-server/server-library/library-pprof-parser/pom.xml
+++ b/oap-server/server-library/library-pprof-parser/pom.xml
@@ -31,9 +31,6 @@
<artifactId>library-pprof-parser</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<checkstyle.skip>true</checkstyle.skip>
</properties>
diff --git a/pom.xml b/pom.xml
index 6bc9b49f46..c7eb40821a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -150,8 +150,7 @@
<revision>10.4.0-SNAPSHOT</revision>
<!-- Built in properties -->
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- `project.build.outputTimestamp` is required for reproducible
builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<project.build.outputTimestamp>1715298980</project.build.outputTimestamp>
diff --git a/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml
b/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml
index 23bb59ceac..12469e3b4e 100644
--- a/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml
+++ b/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml
@@ -16,21 +16,15 @@
version: '2.1'
services:
- etcd:
- extends:
- file: ../../../../script/docker-compose/base-compose.yml
- service: etcd
- networks:
- - e2e
-
data-hot1:
extends:
file: ../../../../script/docker-compose/base-compose.yml
service: banyandb-data
hostname: data-hot1
- command: data --etcd-endpoints=http://etcd:2379 --node-labels type=hot
+ command: data --node-discovery-mode=file
--node-discovery-file-path=/etc/banyandb/nodes.yaml --node-labels type=hot
volumes:
- ../data-generate/sw_metadata:/tmp/measure/data/sw_metadata
+ - ./nodes.yaml:/etc/banyandb/nodes.yaml
networks:
- e2e
@@ -39,7 +33,9 @@ services:
file: ../../../../script/docker-compose/base-compose.yml
service: banyandb-data
hostname: data-warm1
- command: data --etcd-endpoints=http://etcd:2379 --node-labels type=warm
+ command: data --node-discovery-mode=file
--node-discovery-file-path=/etc/banyandb/nodes.yaml --node-labels type=warm
+ volumes:
+ - ./nodes.yaml:/etc/banyandb/nodes.yaml
networks:
- e2e
@@ -48,12 +44,13 @@ services:
file: ../../../../script/docker-compose/base-compose.yml
service: banyandb-data
hostname: data-cold1
- command: data --etcd-endpoints=http://etcd:2379 --node-labels type=cold
+ command: data --node-discovery-mode=file
--node-discovery-file-path=/etc/banyandb/nodes.yaml --node-labels type=cold
volumes:
- ../data-generate/tmp/measure-data/measure:/tmp/measure
- ../data-generate/tmp/stream-data/stream:/tmp/stream
- ../data-generate/tmp/property:/tmp/property
- ../data-generate/tmp/trace:/tmp/trace
+ - ./nodes.yaml:/etc/banyandb/nodes.yaml
networks:
- e2e
@@ -61,7 +58,9 @@ services:
extends:
file: ../../../../script/docker-compose/base-compose.yml
service: liaison
- command: liaison --etcd-endpoints=http://etcd:2379 --data-node-selector
type=hot
+ command: liaison --node-discovery-mode=file
--node-discovery-file-path=/etc/banyandb/nodes.yaml --data-node-selector
type=hot
+ volumes:
+ - ./nodes.yaml:/etc/banyandb/nodes.yaml
networks:
- e2e
diff --git a/test/e2e-v2/cases/storage/banyandb/stages/nodes.yaml
b/test/e2e-v2/cases/storage/banyandb/stages/nodes.yaml
new file mode 100644
index 0000000000..fcc72ce89a
--- /dev/null
+++ b/test/e2e-v2/cases/storage/banyandb/stages/nodes.yaml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+nodes:
+ - name: data-hot1
+ grpc_address: data-hot1:17912
+ - name: data-warm1
+ grpc_address: data-warm1:17912
+ - name: data-cold1
+ grpc_address: data-cold1:17912
+ - name: liaison
+ grpc_address: liaison:17912
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index 96f105986f..e59a6923db 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -23,7 +23,7 @@
SW_AGENT_CLIENT_JS_COMMIT=f08776d909eb1d9bc79c600e493030651b97e491
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
SW_KUBERNETES_COMMIT_SHA=2850db1502283a2d8516146c57cc2b49f1da934b
SW_ROVER_COMMIT=79292fe07f17f98f486e0c4471213e1961fb2d1d
-SW_BANYANDB_COMMIT=e1ba421bd624727760c7a69c84c6fe55878fb526
+SW_BANYANDB_COMMIT=3c0e3a78d112445c293d9b0f0a5599cd9083334f
SW_AGENT_PHP_COMMIT=d1114e7be5d89881eec76e5b56e69ff844691e35
SW_PREDICTOR_COMMIT=54a0197654a3781a6f73ce35146c712af297c994
