From e6d86010876a91d73f24d4733c374b6610090b7d Mon Sep 17 00:00:00 2001
From: Nicole00 <anqi.wang@vesoft.com>
Date: Tue, 23 Nov 2021 17:28:32 +0800
Subject: [PATCH] update version info

---
 README-CN.md                                   | 11 ++++++-----
 README.md                                      | 11 ++++++-----
 nebula-exchange/pom.xml                        |  4 ++--
 .../src/test/resources/docker-compose.yaml     | 18 +++++++++---------
 pom.xml                                        |  2 +-
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/README-CN.md b/README-CN.md
index 6d56bf5b..94f87926 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -17,7 +17,7 @@ Exchange 2.0 仅支持 Nebula Graph 2.x。
     $ mvn clean package -Dmaven.test.skip=true -Dgpg.skip -Dmaven.javadoc.skip=true
     ```
 
-    编译打包完成后，可以在 nebula-exchange/nebula-exchange/target/ 目录下看到 nebula-exchange-2.5-SNAPSHOT.jar 文件。
+    编译打包完成后，可以在 nebula-exchange/nebula-exchange/target/ 目录下看到 nebula-exchange-2.6.1.jar 文件。
 2. 在 Maven 远程仓库下载
     
     正式版本:
@@ -37,7 +37,8 @@ Nebula Exchange 和 Nebula 的版本对应关系如下:
 |       2.1.0             |  2.0.0, 2.0.1  |
 |       2.5.0             |  2.5.0, 2.5.1  |
 |       2.5.1             |  2.5.0, 2.5.1  |
-|       2.6.0             |     2.6.0      |
+|       2.6.0             |  2.6.0,2.6.1   |
+|       2.6.1             |  2.6.0,2.6.1   |
 |     2.5-SNAPSHOT        |     nightly    |
 ## 使用说明
 
@@ -57,7 +58,7 @@ Nebula Exchange 和 Nebula 的版本对应关系如下:
 
 *7. Exchange 2.0 的导入命令：*
 ```
-$SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange --master local nebula-exchange-2.5.0.jar -c /path/to/application.conf
+$SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange --master local nebula-exchange-2.6.1.jar -c /path/to/application.conf
 ```
 如果数据源有HIVE，则导入命令最后还需要加 `-h` 表示启用HIVE数据源。
 
@@ -68,7 +69,7 @@ $SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange \
 --files application.conf \
 --conf spark.driver.extraClassPath=./ \
 --conf spark.executor.extraClassPath=./ \
-nebula-exchange-2.5.0.jar \
+nebula-exchange-2.6.1.jar \
 -c application.conf
 ```
 
@@ -77,7 +78,7 @@ nebula-exchange-2.5.0.jar \
 $SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange \
 --master local \
 --conf spark.sql.shuffle.partitions=200 \
-nebula-exchange-2.5.0.jar \
+nebula-exchange-2.6.1.jar \
 -c application.conf
 ```
 
diff --git a/README.md b/README.md
index 425f48c8..7767fc46 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Exchange 2.0 only supports Nebula Graph 2.0 . If you want to import data for Neb
     $ mvn clean package -Dmaven.test.skip=true -Dgpg.skip -Dmaven.javadoc.skip=true
     ```
 
-    After the packaging, you can see the newly generated nebula-exchange-2.5-SNAPSHOT.jar under the nebula-exchange/nebula-exchange/target/ directory.
+    After the packaging, you can see the newly generated nebula-exchange-2.6.1.jar under the nebula-exchange/nebula-exchange/target/ directory.
 2. Download from Maven repository
    
    release version:
@@ -27,11 +27,11 @@ Exchange 2.0 only supports Nebula Graph 2.0 . If you want to import data for Neb
 
 Import command:
 ```
-$SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange --master local nebula-exchange-2.5.0.jar -c /path/to/application.conf
+$SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange --master local nebula-exchange-2.6.1.jar -c /path/to/application.conf
 ```
 If your source is HIVE, import command is:
 ```
-$SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange --master local nebula-exchange-2.5.0.jar -c /path/to/application.conf -h
+$SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange --master local nebula-exchange-2.6.1.jar -c /path/to/application.conf -h
 ```
 
 Note：Submit Exchange with Yarn-Cluster mode, please use following command：
@@ -41,7 +41,7 @@ $SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange \
 --files application.conf \
 --conf spark.driver.extraClassPath=./ \
 --conf spark.executor.extraClassPath=./ \
-nebula-exchange-2.5.0.jar \
+nebula-exchange-2.6.1.jar \
 -c application.conf
 ```
 
@@ -50,7 +50,7 @@ Note: When use Exchange to generate SST files, please add spark.sql.shuffle.part
 $SPARK_HOME/bin/spark-submit --class com.vesoft.nebula.exchange.Exchange \
 --master local \
 --conf spark.sql.shuffle.partitions=200 \
-nebula-exchange-2.5.0.jar \
+nebula-exchange-2.6.1.jar \
 -c application.conf
 ```
 
@@ -68,6 +68,7 @@ There are the version correspondence between Nebula Exchange and Nebula:
 |       2.5.0             |  2.5.0, 2.5.1  |
 |       2.5.1             |  2.5.0, 2.5.1  |
 |       2.6.0             |  2.6.0, 2.6.1  |
+|       2.6.1             |  2.6.0, 2.6.1  |
 |     2.5-SNAPSHOT        |     nightly    |
 
 ## New Features
diff --git a/nebula-exchange/pom.xml b/nebula-exchange/pom.xml
index 8f1b6cb7..72c8eb88 100644
--- a/nebula-exchange/pom.xml
+++ b/nebula-exchange/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>nebula-spark</artifactId>
         <groupId>com.vesoft</groupId>
-        <version>2.5-SNAPSHOT</version>
+        <version>2.6.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
         <scala-logging.version>3.9.2</scala-logging.version>
         <scala-xml.version>2.11.0-M4</scala-xml.version>
         <scopt.version>3.7.1</scopt.version>
-        <nebula.version>2.0.0-SNAPSHOT</nebula.version>
+        <nebula.version>2.6.1</nebula.version>
         <s2.version>1.0.0</s2.version>
         <neo.version>2.4.5-M1</neo.version>
         <gremlin.version>3.4.6</gremlin.version>
diff --git a/nebula-exchange/src/test/resources/docker-compose.yaml b/nebula-exchange/src/test/resources/docker-compose.yaml
index a2c5a37f..67a4d84b 100644
--- a/nebula-exchange/src/test/resources/docker-compose.yaml
+++ b/nebula-exchange/src/test/resources/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   metad0:
-    image: vesoft/nebula-metad:nightly
+    image: vesoft/nebula-metad:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -36,7 +36,7 @@ services:
       - SYS_PTRACE
 
   metad1:
-    image: vesoft/nebula-metad:nightly
+    image: vesoft/nebula-metad:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -71,7 +71,7 @@ services:
       - SYS_PTRACE
 
   metad2:
-    image: vesoft/nebula-metad:nightly
+    image: vesoft/nebula-metad:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -106,7 +106,7 @@ services:
       - SYS_PTRACE
 
   storaged0:
-    image: vesoft/nebula-storaged:nightly
+    image: vesoft/nebula-storaged:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -145,7 +145,7 @@ services:
       - SYS_PTRACE
 
   storaged1:
-    image: vesoft/nebula-storaged:nightly
+    image: vesoft/nebula-storaged:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -184,7 +184,7 @@ services:
       - SYS_PTRACE
 
   storaged2:
-    image: vesoft/nebula-storaged:nightly
+    image: vesoft/nebula-storaged:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -223,7 +223,7 @@ services:
       - SYS_PTRACE
 
   graphd0:
-    image: vesoft/nebula-graphd:nightly
+    image: vesoft/nebula-graphd:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -259,7 +259,7 @@ services:
       - SYS_PTRACE
 
   graphd1:
-    image: vesoft/nebula-graphd:nightly
+    image: vesoft/nebula-graphd:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
@@ -295,7 +295,7 @@ services:
       - SYS_PTRACE
 
   graphd2:
-    image: vesoft/nebula-graphd:nightly
+    image: vesoft/nebula-graphd:v2.6.0
     environment:
       USER: root
       TZ:   "${TZ}"
diff --git a/pom.xml b/pom.xml
index 92ddb270..3f3d0f17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.vesoft</groupId>
     <artifactId>nebula-spark</artifactId>
     <packaging>pom</packaging>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.6.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>