* master:
upgraded version of bft-smart;
upgraded version to 1.4.1.RELEASE;
upgraded dependency of binary proto;
upgraded the dependency of utils;
upgraded the depending versions of utils project and binaryproto project;
upgraded modules to rename the importing packages of utils;
renamed the importing packages of http service agent framework;
upgraded submodules to fix compilation error;
added new module: libs/httpservice;
renamed the importing packages of http service agent framework;
upgraded binary-proto module;
upgraded binary-proto module;
added new modules;
renamed the importing packages of binary-proto;
refactored the structure of projects;
added new libs;
# Conflicts:
# core
# deploy/deploy-gateway/pom.xml
# deploy/deploy-peer/pom.xml
# deploy/docker/docker-demo/pom.xml
# deploy/docker/docker-sdk/pom.xml
# deploy/docker/pom.xml
# deploy/pom.xml
# samples/pom.xml
# test
* dev: (49 commits)
upgraded the version of core, explorer and test module to 1.5.0-SNAPSHOT;
published 1.4.0.RELEASE;
upgraded modules;
update log configurations
update contract samples
update log configurations
upgraded modules;
upgraded modules to fix bugs of kvdb storage;
add error rolling
update gateway log configuration
update log configurations
fix jira 628, update bftsmart lib
fix dataAccount sample error
update bftsmart
upgraded modules to fix the dead lock bugs of consensus thread that the consensus lock is held by a waiting thread;
upgraded modules to fix the bugs of concurrent competition between the process of consensus and the process of Heartbeat;
update samples
upgraded modules;
optimized the consensus testcases;
upgraded modules;
...