Merge branch 'master' into release/1.5.0

* master:
  upgraded the version of parent project and the submodule projects;
  upgraded utils;

# Conflicts:
#	core
#	deploy/pom.xml
#	framework
#	libs/bft-smart
#	libs/utils
#	samples/pom.xml
#	test

deploy/deploy-gateway/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.4.2.RELEASE</version>
+		<version>1.4.3.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.2.RELEASE</version>
+		<version>1.4.3.RELEASE</version>
 	</parent>
 	<artifactId>deploy-peer</artifactId>
 

deploy/docker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>deploy-root</artifactId>
-        <version>1.4.2.RELEASE</version>
+        <version>1.4.3.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -13,7 +13,7 @@
     <artifactId>docker</artifactId>
 	
 	<properties>
-		<framework.version>1.4.2.RELEASE</framework.version>
+		<framework.version>1.4.3.RELEASE</framework.version>
 	</properties>
 
     <modules>

deploy/pom.xml

@@ -9,11 +9,11 @@
 		<relativePath>../project/parent</relativePath>
 	</parent>
 	<artifactId>deploy-root</artifactId>
-	<version>1.4.2.RELEASE</version>
+	<version>1.4.3.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<properties>
-		<core.version>1.5.0-SNAPSHOT</core.version>
+		<core.version>1.4.3.RELEASE</core.version>
 	</properties>
 
 	<modules>

samples/contract-samples/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>jdchain-samples</artifactId>
-        <version>1.4.2.RELEASE</version>
+        <version>1.4.3.RELEASE</version>
     </parent>
 
     <!-- 声明为合约代码工程，编译输出扩展名为".car"合约代码 -->

samples/pom.xml

@@ -4,12 +4,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.jd.blockchain</groupId>
     <artifactId>jdchain-samples</artifactId>
-    <version>1.4.2.RELEASE</version>
+    <version>1.4.3.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <framework.version>1.4.2.RELEASE</framework.version>
-        <core.version>1.5.0-SNAPSHOT</core.version>
+        <framework.version>1.4.3.RELEASE</framework.version>
     </properties>
 
     <modules>

samples/sdk-samples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>jdchain-samples</artifactId>
-        <version>1.4.2.RELEASE</version>
+        <version>1.4.3.RELEASE</version>
     </parent>
     <artifactId>sdk-samples</artifactId>