Merge branch 'feature/module-refactor' into develop

# Conflicts:
#	project/dependencies/pom.xml
#	test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "explorer"]
+	path = explorer
+	url = git@github.com:blockchain-jd-com/explorer.git
+[submodule "libs/bft-smart"]
+	path = libs/bft-smart
+	url = git@github.com:blockchain-jd-com/bftsmart.git

build/build.sh

@@ -0,0 +1,18 @@
+
+
+#调用当前脚本目录下 env.sh 脚本，设置环境变量，处理当前传入参数；
+source `dirname $0`/env.sh "$*"
+
+echo "主目录：$BASE_DIR"
+
+#判断是否忽略测试；
+if [ $SKIP_TESTS == 1 ]
+then 
+    echo "略过测试。。。"
+else
+    #执行测试；
+    source $TEST_SHELL
+fi
+
+#执行打包构建；
+source $PACK_SHELL

build/env.sh

@@ -0,0 +1,56 @@
+
+
+if [ $ENV_SHELL ]
+then
+    #如果已经设置过环境变量，则不再重复执行；
+    echo "略过初始化环境变量。。。"
+    return
+fi
+
+echo "---------------- 初始化环境变量 ----------------"
+
+#主代码库的根目录
+BASE_DIR=$(cd `dirname $0`/..; pwd)
+
+#标记环境变量脚本；
+ENV_SHELL=$BASE_DIR/build/env.sh
+
+#执行代码库更新的脚本；
+UPDATE_SHELL=$BASE_DIR/build/update.sh
+
+#执行测试的脚本；
+TEST_SHELL=$BASE_DIR/build/test.sh
+
+#执行构建打包产品的脚本；
+PACK_SHELL=$BASE_DIR/build/pack.sh
+
+#框架工程的Git仓库的根目录
+FRAMEWORK_DIR=$BASE_DIR/framework
+
+#核心实现工程的Git仓库的根目录
+CORE_DIR=$BASE_DIR/core
+
+#打包工程的Git仓库的根目录
+DEPLOY_DIR=$BASE_DIR/deploy
+
+#测试工程的Git仓库的根目录
+TEST_DIR=$BASE_DIR/test
+
+#初始化参数：是否略过测试步骤；
+SKIP_TESTS=0
+
+#检查输入参数
+for i in $*; do 
+    case $i in 
+    "--skipTests")
+        #忽略测试；
+        echo "收到参数 --skipTests 指示略过测试环节。。。"
+
+        SKIP_TESTS=1
+        ;;
+    esac
+done
+
+echo "---------------- 完成环境变量初始化 ----------------"
+
+

build/pack.sh

@@ -0,0 +1,32 @@
+
+
+#调用当前脚本目录下 env.sh 脚本，设置环境变量，处理当前传入参数；
+if [ ! $ENV_SHELL ]
+then 
+    source `dirname $0`/env.sh "$*"
+fi
+
+# 更新代码库；
+source $UPDATE_SHELL
+
+echo "--------------- 开始编译打包产品 ---------------"
+
+cd $DEPLOY_DIR
+echo "当前目录：`pwd`"
+
+#初始化变量 SKIP_TESTS；
+if [ ! $SKIP_TESTS ]
+then 
+    SKIP_TESTS=0
+fi
+
+if [ $SKIP_TESTS == 1 ]
+then
+    echo "执行命令：mvn clean package -DskipTests=true"
+    mvn clean package -DskipTests=true
+else
+    echo "执行命令：mvn clean package"
+    mvn clean package
+fi
+
+echo "--------------- 完成编译打包产品 ---------------"

build/test.sh

@@ -0,0 +1,21 @@
+
+
+#调用当前脚本目录下 env.sh 脚本，设置环境变量，处理当前传入参数；
+if [ ! $ENV_SHELL ]
+then 
+    source `dirname $0`/env.sh "$*"
+fi
+
+# 更新代码库；
+source $UPDATE_SHELL
+
+
+echo "---------------- 开始集成测试 ----------------"
+
+cd $TEST_DIR
+echo "当前目录：`pwd`"
+
+echo "执行命令：mvn clean package"
+mvn clean package
+
+echo "---------------- 完成集成测试 ----------------"

build/update.sh

@@ -0,0 +1,27 @@
+
+#调用当前脚本目录下 env.sh 脚本，设置环境变量，处理当前传入参数；
+if [ ! $ENV_SHELL ]
+then 
+    source `dirname $0`/env.sh "$*"
+fi
+
+#初始化变量 SUBMODULES_UPDATED
+if [ ! $SUBMODULES_UPDATED ]
+then
+    SUBMODULES_UPDATED=0
+fi
+
+if [ $SUBMODULES_UPDATED == 1 ]
+then
+    echo "代码库已经最新，略过更新操作。。。"
+else
+    
+    echo "---------------- 更新代码库 ----------------"
+    cd $BASE_DIR
+    git submodule update --init --recursive
+
+    #标记代码已经更新；
+    SUBMODULES_UPDATED=1
+
+    echo "---------------- 完成代码库更新 ----------------"
+fi

source/consensus/consensus-bftsmart/pom.xml → core/consensus/consensus-bftsmart/pom.xml

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>consensus</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>consensus-core</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>consensus-bftsmart</artifactId>
 
@@ -13,6 +13,7 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>bft-smart</artifactId>
+			<version>${bftsmart.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
@@ -22,12 +23,12 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>consensus-framework</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>utils-common</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -36,7 +37,7 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>ledger-model</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
@@ -50,17 +51,5 @@
         </dependency> -->
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 
 </project>

source/consensus/consensus-mq/pom.xml → core/consensus/consensus-mq/pom.xml

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>consensus</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>consensus-core</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>consensus-mq</artifactId>
 

source/consensus/pom.xml → core/consensus/pom.xml

@@ -4,14 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>jdchain-root</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>jdchain-core</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>consensus</artifactId>
+	<artifactId>consensus-core</artifactId>
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>consensus-framework</module>
 		<module>consensus-bftsmart</module>
 		<module>consensus-mq</module>
 	</modules>

source/contract/contract-jvm/pom.xml → core/contract/contract-jvm/pom.xml

@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>contract</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>contract-core</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>contract-jvm</artifactId>