Reactored core modules;

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>0.3.0.RELEASE</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>

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>
 

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>

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>
 

core/contract/contract-maven-plugin/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-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>

core/contract/pom.xml

@@ -3,17 +3,15 @@
 	<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>contract</artifactId>
+	<artifactId>contract-core</artifactId>
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>contract-framework</module>
 		<module>contract-jvm</module>
 		<module>contract-maven-plugin</module>
-        <module>contract-samples</module>
     </modules>
 
 </project>

core/crypto/crypto-adv/pom.xml

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

core/crypto/crypto-pki/pom.xml

@@ -2,12 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>crypto</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.1.2.RELEASE</version>
+        <artifactId>crypto-core</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+    
 
     <artifactId>crypto-pki</artifactId>
 
@@ -15,7 +16,7 @@
         <dependency>
             <groupId>com.jd.blockchain</groupId>
             <artifactId>crypto-framework</artifactId>
-            <version>${project.version}</version>
+            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>

core/crypto/pom.xml

@@ -4,16 +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>crypto</artifactId>
+	<artifactId>crypto-core</artifactId>
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>crypto-framework</module>
-		<module>crypto-classic</module>
-		<module>crypto-sm</module>
 		<!--	<module>crypto-jni-clib</module> -->
 		<module>crypto-adv</module>
 		<module>crypto-pki</module>

core/gateway/pom.xml

@@ -4,8 +4,8 @@
 	<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>gateway</artifactId>
 
@@ -13,7 +13,7 @@
 		<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>
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>sdk-base</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 
 		<dependency>
@@ -46,30 +46,31 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>data-explorer</artifactId>
+			<version>1.1.1.RELEASE</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>utils-web</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>crypto-framework</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>crypto-classic</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>crypto-sm</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 
 		<dependency>

core/ledger/ledger-core/pom.xml → core/ledger/ledger-database/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>ledger</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>ledger-core</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>ledger-core</artifactId>
+	<artifactId>ledger-database</artifactId>
 
 	<dependencies>
 		<dependency>
@@ -33,12 +33,12 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-service</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>contract-framework</artifactId>
-			<version>${project.version}</version>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>