From e407f381e3e6ea42dd2928952a61658b05a5a892 Mon Sep 17 00:00:00 2001 From: Anqi Date: Mon, 6 Feb 2023 11:49:44 +0800 Subject: [PATCH] update version to 3.4.0 (#123) --- README-CN.md | 3 + README.md | 3 + exchange-common/pom.xml | 4 +- .../src/test/resources/docker-compose.yaml | 20 +- nebula-exchange_spark_2.2/pom.xml | 2 +- nebula-exchange_spark_2.4/pom.xml | 2 +- .../src/test/resources/docker-compose.yaml | 353 ------------------ nebula-exchange_spark_3.0/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 22 insertions(+), 369 deletions(-) delete mode 100644 nebula-exchange_spark_2.4/src/test/resources/docker-compose.yaml diff --git a/README-CN.md b/README-CN.md index 3571b3e4..8baefd77 100644 --- a/README-CN.md +++ b/README-CN.md @@ -58,6 +58,9 @@ Nebula Exchange 和 Nebula 的版本对应关系如下: |nebula-exchange_spark_2.2-3.3.0.jar| 3.x.x |2.2.*| |nebula-exchange_spark_2.4-3.3.0.jar| 3.x.x |2.4.*| |nebula-exchange_spark_3.0-3.3.0.jar| 3.x.x |`3.0.*`,`3.1.*`,`3.2.*`,`3.3.*`| +|nebula-exchange_spark_2.2-3.4.0.jar| 3.x.x |2.2.*| +|nebula-exchange_spark_2.4-3.4.0.jar| 3.x.x |2.4.*| +|nebula-exchange_spark_3.0-3.4.0.jar| 3.x.x |`3.0.*`,`3.1.*`,`3.2.*`,`3.3.*`| |nebula-exchange_spark_2.2-3.0-SNAPSHOT.jar| nightly |2.2.*| |nebula-exchange_spark_2.4-3.0-SNAPSHOT.jar| nightly |2.4.*| |nebula-exchange_spark_3.0-3.0-SNAPSHOT.jar| nightly |`3.0.*`,`3.1.*`,`3.2.*`,`3.3.*`| diff --git a/README.md b/README.md index 2d1bc25d..6ba5ebb7 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,9 @@ There are the version correspondence between Nebula Exchange and Nebula: |nebula-exchange_spark_2.2-3.3.0.jar| 3.x.x |2.2.*| |nebula-exchange_spark_2.4-3.3.0.jar| 3.x.x |2.4.*| |nebula-exchange_spark_3.0-3.3.0.jar| 3.x.x |`3.0.*`,`3.1.*`,`3.2.*`,`3.3.*`| +|nebula-exchange_spark_2.2-3.4.0.jar| 3.x.x |2.2.*| +|nebula-exchange_spark_2.4-3.4.0.jar| 3.x.x |2.4.*| +|nebula-exchange_spark_3.0-3.4.0.jar| 3.x.x |`3.0.*`,`3.1.*`,`3.2.*`,`3.3.*`| |nebula-exchange_spark_2.2-3.0-SNAPSHOT.jar| nightly |2.2.*| |nebula-exchange_spark_2.4-3.0-SNAPSHOT.jar| nightly |2.4.*| |nebula-exchange_spark_3.0-3.0-SNAPSHOT.jar| nightly |`3.0.*`,`3.1.*`,`3.2.*`,`3.3.*`| diff --git a/exchange-common/pom.xml b/exchange-common/pom.xml index 54ae3519..f59ae6f6 100644 --- a/exchange-common/pom.xml +++ b/exchange-common/pom.xml @@ -5,7 +5,7 @@ exchange com.vesoft - 3.0-SNAPSHOT + 3.4.0 4.0.0 @@ -14,7 +14,7 @@ 1.8 1.8 - 3.0-SNAPSHOT + 3.4.0 3.2.0 3.9.2 diff --git a/exchange-common/src/test/resources/docker-compose.yaml b/exchange-common/src/test/resources/docker-compose.yaml index fb28aea4..671b72b4 100644 --- a/exchange-common/src/test/resources/docker-compose.yaml +++ b/exchange-common/src/test/resources/docker-compose.yaml @@ -1,7 +1,7 @@ version: '3.4' services: metad0: - image: vesoft/nebula-metad:nightly + image: vesoft/nebula-metad:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -36,7 +36,7 @@ services: - SYS_PTRACE metad1: - image: vesoft/nebula-metad:nightly + image: vesoft/nebula-metad:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -71,7 +71,7 @@ services: - SYS_PTRACE metad2: - image: vesoft/nebula-metad:nightly + image: vesoft/nebula-metad:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -106,7 +106,7 @@ services: - SYS_PTRACE storaged0: - image: vesoft/nebula-storaged:nightly + image: vesoft/nebula-storaged:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -145,7 +145,7 @@ services: - SYS_PTRACE storaged1: - image: vesoft/nebula-storaged:nightly + image: vesoft/nebula-storaged:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -184,7 +184,7 @@ services: - SYS_PTRACE storaged2: - image: vesoft/nebula-storaged:nightly + image: vesoft/nebula-storaged:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -223,7 +223,7 @@ services: - SYS_PTRACE graphd0: - image: vesoft/nebula-graphd:nightly + image: vesoft/nebula-graphd:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -259,7 +259,7 @@ services: - SYS_PTRACE graphd1: - image: vesoft/nebula-graphd:nightly + image: vesoft/nebula-graphd:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -295,7 +295,7 @@ services: - SYS_PTRACE graphd2: - image: vesoft/nebula-graphd:nightly + image: vesoft/nebula-graphd:v3.4.0 environment: USER: root TZ: "${TZ}" @@ -331,7 +331,7 @@ services: - SYS_PTRACE console: - image: vesoft/nebula-console:nightly + image: vesoft/nebula-console:v3.4.0 entrypoint: "" command: - sh diff --git a/nebula-exchange_spark_2.2/pom.xml b/nebula-exchange_spark_2.2/pom.xml index acf99ac7..6f7d19c5 100644 --- a/nebula-exchange_spark_2.2/pom.xml +++ b/nebula-exchange_spark_2.2/pom.xml @@ -5,7 +5,7 @@ exchange com.vesoft - 3.0-SNAPSHOT + 3.4.0 4.0.0 diff --git a/nebula-exchange_spark_2.4/pom.xml b/nebula-exchange_spark_2.4/pom.xml index ac794e9b..b67a79f7 100644 --- a/nebula-exchange_spark_2.4/pom.xml +++ b/nebula-exchange_spark_2.4/pom.xml @@ -5,7 +5,7 @@ exchange com.vesoft - 3.0-SNAPSHOT + 3.4.0 ../pom.xml 4.0.0 diff --git a/nebula-exchange_spark_2.4/src/test/resources/docker-compose.yaml b/nebula-exchange_spark_2.4/src/test/resources/docker-compose.yaml deleted file mode 100644 index fb28aea4..00000000 --- a/nebula-exchange_spark_2.4/src/test/resources/docker-compose.yaml +++ /dev/null @@ -1,353 +0,0 @@ -version: '3.4' -services: - metad0: - image: vesoft/nebula-metad:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --local_ip=172.28.1.1 - - --ws_ip=172.28.1.1 - - --port=9559 - - --data_path=/data/meta - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.1.1:11000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9559:9559" - - 11000 - - 11002 - volumes: - - ./data/meta0:/data/meta:Z - - ./logs/meta0:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.1.1 - restart: on-failure - cap_add: - - SYS_PTRACE - - metad1: - image: vesoft/nebula-metad:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --local_ip=172.28.1.2 - - --ws_ip=172.28.1.2 - - --port=9559 - - --data_path=/data/meta - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.1.2:11000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9560:9559" - - 11000 - - 11002 - volumes: - - ./data/meta1:/data/meta:Z - - ./logs/meta1:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.1.2 - restart: on-failure - cap_add: - - SYS_PTRACE - - metad2: - image: vesoft/nebula-metad:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --local_ip=172.28.1.3 - - --ws_ip=172.28.1.3 - - --port=9559 - - --data_path=/data/meta - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.1.3:11000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9561:9559" - - 11000 - - 11002 - volumes: - - ./data/meta2:/data/meta:Z - - ./logs/meta2:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.1.3 - restart: on-failure - cap_add: - - SYS_PTRACE - - storaged0: - image: vesoft/nebula-storaged:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --local_ip=172.28.2.1 - - --ws_ip=172.28.2.1 - - --port=9779 - - --data_path=/data/storage - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - depends_on: - - metad0 - - metad1 - - metad2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.2.1:12000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9779:9779" - - 12000 - - 12002 - volumes: - - ./data/storage0:/data/storage:Z - - ./logs/storage0:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.2.1 - restart: on-failure - cap_add: - - SYS_PTRACE - - storaged1: - image: vesoft/nebula-storaged:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --local_ip=172.28.2.2 - - --ws_ip=172.28.2.2 - - --port=9779 - - --data_path=/data/storage - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - depends_on: - - metad0 - - metad1 - - metad2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.2.2:12000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9780:9779" - - 12000 - - 12002 - volumes: - - ./data/storage1:/data/storage:Z - - ./logs/storage1:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.2.2 - restart: on-failure - cap_add: - - SYS_PTRACE - - storaged2: - image: vesoft/nebula-storaged:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --local_ip=172.28.2.3 - - --ws_ip=172.28.2.3 - - --port=9779 - - --data_path=/data/storage - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - depends_on: - - metad0 - - metad1 - - metad2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.2.3:12000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9781:9779" - - 12000 - - 12002 - volumes: - - ./data/storage2:/data/storage:Z - - ./logs/storage2:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.2.3 - restart: on-failure - cap_add: - - SYS_PTRACE - - graphd0: - image: vesoft/nebula-graphd:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --port=9669 - - --ws_ip=172.28.3.1 - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - depends_on: - - metad0 - - metad1 - - metad2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.3.1:13000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9669:9669" - - 13000 - - 13002 - volumes: - - ./logs/graph0:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.3.1 - restart: on-failure - cap_add: - - SYS_PTRACE - - graphd1: - image: vesoft/nebula-graphd:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --port=9669 - - --ws_ip=172.28.3.2 - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - depends_on: - - metad0 - - metad1 - - metad2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.3.2:13000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9670:9669" - - 13000 - - 13002 - volumes: - - ./logs/graph1:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.3.2 - restart: on-failure - cap_add: - - SYS_PTRACE - - graphd2: - image: vesoft/nebula-graphd:nightly - environment: - USER: root - TZ: "${TZ}" - command: - - --meta_server_addrs=172.28.1.1:9559,172.28.1.2:9559,172.28.1.3:9559 - - --port=9669 - - --ws_ip=172.28.3.3 - - --log_dir=/logs - - --v=0 - - --minloglevel=0 - - --heartbeat_interval_secs=2 - depends_on: - - metad0 - - metad1 - - metad2 - healthcheck: - test: ["CMD", "curl", "-f", "http://172.28.3.3:13000/status"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 20s - ports: - - "9671:9669" - - 13000 - - 13002 - volumes: - - ./logs/graph2:/logs:Z - networks: - nebula-net: - ipv4_address: 172.28.3.3 - restart: on-failure - cap_add: - - SYS_PTRACE - - console: - image: vesoft/nebula-console:nightly - entrypoint: "" - command: - - sh - - -c - - | - sleep 3 && - nebula-console -addr graphd0 -port 9669 -u root -p nebula -e 'ADD HOSTS "172.28.2.1":9779,"172.28.2.2":9779,"172.28.2.3":9779' && - sleep 36000 - depends_on: - - graphd0 - networks: - - nebula-net - -networks: - nebula-net: - ipam: - driver: default - config: - - subnet: 172.28.0.0/16 diff --git a/nebula-exchange_spark_3.0/pom.xml b/nebula-exchange_spark_3.0/pom.xml index 825c1a59..47721ca8 100644 --- a/nebula-exchange_spark_3.0/pom.xml +++ b/nebula-exchange_spark_3.0/pom.xml @@ -5,7 +5,7 @@ exchange com.vesoft - 3.0-SNAPSHOT + 3.4.0 4.0.0 diff --git a/pom.xml b/pom.xml index 6aecd197..e4d89d04 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.vesoft exchange pom - 3.0-SNAPSHOT + 3.4.0 nebula-exchange