Merge commit '57ecf955d19bef0cede147e8c54ca60cf5d5e908' into release/1.4.0

* commit '57ecf955d19bef0cede147e8c54ca60cf5d5e908':
  fix shell error
  modify version to 1.4.0 release, and add miss code

deploy/deploy-gateway/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 	<artifactId>deploy-gateway</artifactId>
 

deploy/deploy-peer/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 	<artifactId>deploy-peer</artifactId>
 
@@ -58,6 +58,24 @@
 			<version>${core.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>tools-regparti-booter</artifactId>
+			<version>${core.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>tools-activeparti-booter</artifactId>
+			<version>${core.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>tools-deactiveparti-booter</artifactId>
+			<version>${core.version}</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

deploy/deploy-peer/src/main/resources/scripts/active-parti.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+HOME=$(cd `dirname $0`;cd ../; pwd)
+boot_file=$(ls ../libs | grep tools-activeparti-booter-)
+if [ ! -n "$boot_file" ]; then
+  echo "tools-activeparti-booter is null"
+else
+    echo "active participant"
+    java -jar $HOME/libs/$boot_file $*
+fi

deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+HOME=$(cd `dirname $0`;cd ../; pwd)
+boot_file=$(ls ../libs | grep tools-deactiveparti-booter-)
+if [ ! -n "$boot_file" ]; then
+  echo "tools-deactiveparti-booter is null"
+else
+    echo "deactive participant"
+    java -jar $HOME/libs/$boot_file $*
+fi

deploy/deploy-peer/src/main/resources/scripts/reg-parti.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+HOME=$(cd `dirname $0`;cd ../; pwd)
+  boot_file=$(ls ../libs | grep tools-regparti-booter-)
+  if [ ! -n "$boot_file" ]; then
+    echo "tools-regparti-booter is null"
+  else
+      echo "register new participant"
+      java -jar $HOME/libs/$boot_file $*
+  fi

deploy/pom.xml

@@ -9,7 +9,7 @@
 		<relativePath>../project/parent</relativePath>
 	</parent>
 	<artifactId>deploy-root</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.4.0.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<properties>

explorer

@@ -1 +1 @@
-Subproject commit f79293ab00e5ac74382d442ec5027604ee8260ea
+Subproject commit 3ffc3324c9fe20307cc36c07c361daa1f5d3f11e