From 7236cea803a34fd9df41dc20a0e7e61c30904087 Mon Sep 17 00:00:00 2001
From: punk <punk8sang@gmail.com>
Date: Fri, 21 Apr 2023 13:03:15 +0800
Subject: [PATCH] 1. merge develop 2. update version to 0.6.3

---
 docs/XDAGJ_Cli_Wallet_en.md                 | 4 ++--
 pom.xml                                     | 2 +-
 script/xdag.bat                             | 2 +-
 script/xdag.sh                              | 2 +-
 src/main/java/io/xdag/config/Constants.java | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/XDAGJ_Cli_Wallet_en.md b/docs/XDAGJ_Cli_Wallet_en.md
index d1ff2700..38ad09cb 100644
--- a/docs/XDAGJ_Cli_Wallet_en.md
+++ b/docs/XDAGJ_Cli_Wallet_en.md
@@ -39,7 +39,7 @@ total 95464
 drwxr-xr-x   4 xdager  wheel       128  5 24 14:22 .
 drwxr-xr-x  16 xdager  wheel       512  5 24 14:21 ..
 -rwxr-xr-x   1 xdager  wheel       275  5 24 14:21 xdag.sh
--rw-r--r--   1 xdager  wheel  48869970  5 24 14:21 xdagj-0.6.2-shaded.jar
+-rw-r--r--   1 xdager  wheel  48869970  5 24 14:21 xdagj-0.6.3-shaded.jar
 ```
 
 ## Usage
@@ -185,5 +185,5 @@ This command is used to display the xdagj version number.
 
 ```shell
 xdager@localhost xdag_full_node % ./xdag.sh --version
-0.6.2
+0.6.3
 ```
diff --git a/pom.xml b/pom.xml
index b75481cc..987318ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.xdag</groupId>
     <artifactId>xdagj</artifactId>
-    <version>0.6.2</version>
+    <version>0.6.3</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/script/xdag.bat b/script/xdag.bat
index a9e16c49..5b83d402 100644
--- a/script/xdag.bat
+++ b/script/xdag.bat
@@ -1,6 +1,6 @@
 @echo off
 
-set XDAG_VERSION="0.6.2"
+set XDAG_VERSION="0.6.3"
 set XDAG_JARNAME="xdagj-%XDAG_VERSION%-shaded.jar"
 set XDAG_OPTS="-t"
 
diff --git a/script/xdag.sh b/script/xdag.sh
index 75347978..d61031f7 100755
--- a/script/xdag.sh
+++ b/script/xdag.sh
@@ -2,7 +2,7 @@
 
 ulimit -n unlimited
 
-XDAG_VERSION="0.6.2"
+XDAG_VERSION="0.6.3"
 XDAG_JARNAME="xdagj-${XDAG_VERSION}-shaded.jar"
 XDAG_OPTS="-t"
 
diff --git a/src/main/java/io/xdag/config/Constants.java b/src/main/java/io/xdag/config/Constants.java
index 51ad63fb..c9c342a3 100644
--- a/src/main/java/io/xdag/config/Constants.java
+++ b/src/main/java/io/xdag/config/Constants.java
@@ -73,7 +73,7 @@ public class Constants {
 
     public static final String WALLET_FILE_NAME = "wallet.data";
 
-    public static final String CLIENT_VERSION = "0.6.2";
+    public static final String CLIENT_VERSION = "0.6.3";
 
     /**
      * 同步问题 分叉高度