Merge branch 'hotfix/545-1.4.0Release-verison-bug' into 'release/1.4.0'

Hotfix/545 1.4.0 release verison bug

See merge request jd-blockchain/jdchain!18

core

@@ -1 +1 @@
-Subproject commit ce1d81ddeb51ddc2f96c5d7e1a89b7383ace9352
+Subproject commit 8592001ea0af771c88357767031b59377b3d2a40

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,11 +9,11 @@
 		<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>
-		<core.version>1.4.0-SNAPSHOT</core.version>
+		<core.version>1.4.0.RELEASE</core.version>
 	</properties>
 
 	<modules>

explorer

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

framework

@@ -1 +1 @@
-Subproject commit 4b6516c469753d124b0d9bde1c1d46e6f661e221
+Subproject commit 647bcffa1a4b0a6cf4df0db8e55247ca84890224

libs/bft-smart

@@ -1 +1 @@
-Subproject commit 8a3c8963b270e1126ed1fdc8573fafe92ed1e3f3
+Subproject commit a038dcf677d0fc5ed2f72794606c332538fe85fa

test

@@ -1 +1 @@
-Subproject commit 334d9f1c584a2dd2adb959c3f9bf00d7e5a51202
+Subproject commit f0bcf9a13568af8d1b6c036463246de9719734bd