Fixed compilation errors of framework;

core/gateway/pom.xml

@@ -28,8 +28,8 @@
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
-			<artifactId>ledger-rpc</artifactId>
-			<version>${project.version}</version>
+			<artifactId>sdk-rpc</artifactId>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>data-explorer</artifactId>
-			<version>1.1.1.RELEASE</version>
+			<version>1.1.2.RELEASE</version>
 		</dependency>
 
 		<dependency>

core/ledger/pom.xml

@@ -12,6 +12,5 @@
 
 	<modules>
 		<module>ledger-database</module>
-		<module>ledger-rpc</module>
 	</modules>
 </project>

core/manager/manager-web/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.jd.blockchain</groupId>
             <artifactId>manager-explorer</artifactId>
-            <version>1.1.1.RELEASE</version>
+            <version>1.1.2.RELEASE</version>
         </dependency>
 
         <dependency>

core/peer/pom.xml

@@ -27,8 +27,8 @@
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
-			<artifactId>ledger-rpc</artifactId>
-			<version>${project.version}</version>
+			<artifactId>sdk-rpc</artifactId>
+			<version>${framework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>

core/pom.xml

@@ -6,6 +6,7 @@
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-parent</artifactId>
 		<version>1.1.1.RELEASE</version>
+		<relativePath>../project/parent</relativePath>
 	</parent>
 
 	<groupId>com.jd.blockchain</groupId>
@@ -18,6 +19,7 @@
 	</properties>
 
 	<modules>
+		<module>../framework</module>
 		<module>consensus</module>
 		<module>contract</module>
 		<module>crypto</module>

deploy/deploy-gateway/pom.xml

@@ -4,30 +4,31 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>deployment</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>deploy-root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>deployment-gateway</artifactId>
+	<artifactId>deploy-gateway</artifactId>
+	
 
 	<dependencies>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>gateway</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>consensus-bftsmart</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>consensus-mq</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>crypto-classic</artifactId>
 			<version>${project.version}</version>
@@ -36,7 +37,7 @@
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>crypto-sm</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency> -->
 	</dependencies>
 
 	<build>

deploy/deploy-peer/pom.xml

@@ -4,33 +4,33 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>deployment</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>deploy-root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>deployment-peer</artifactId>
+	<artifactId>deploy-peer</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>peer</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>runtime-modular</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>runtime-modular-booter</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>manager-booter</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-composite</artifactId>
 			<version>${project.version}</version>
@@ -39,16 +39,16 @@
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-service</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-redis</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>storage-rocksdb</artifactId>
-			<version>${project.version}</version>
+			<version>${core.version}</version>
 		</dependency>
 
 		<!-- <dependency> <groupId>com.jd.blockchain</groupId> <artifactId>gateway</artifactId> 

deploy/pom.xml

@@ -4,27 +4,22 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>jdchain-root</artifactId>
-		<version>1.1.2.RELEASE</version>
+		<artifactId>jdchain-parent</artifactId>
+		<version>1.1.1.RELEASE</version>
+		<relativePath>../project/parent</relativePath>
 	</parent>
-	<artifactId>deployment</artifactId>
+	<artifactId>deploy-root</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
+	<properties>
+		<core.version>1.2.0-SNAPSHOT</core.version>
+	</properties>
+
 	<modules>
-		<module>deployment-gateway</module>
-		<module>deployment-peer</module>
+		<module>../core</module>
+		<module>deploy-gateway</module>
+		<module>deploy-peer</module>
 	</modules>
 
-	<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>

framework/pom.xml

@@ -6,6 +6,7 @@
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-parent</artifactId>
 		<version>1.1.1.RELEASE</version>
+		<relativePath>../project/parent</relativePath>
 	</parent>
 
 	<artifactId>jdchain-framework</artifactId>

framework/sdk/pom.xml

@@ -10,6 +10,7 @@
 	<packaging>pom</packaging>
 
 	<modules>
+		<module>sdk-rpc</module>
 		<module>sdk-base</module>
 		<module>sdk-client</module>
     </modules>

framework/sdk/sdk-client/pom.xml

@@ -17,7 +17,7 @@
 
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
-			<artifactId>ledger-rpc</artifactId>
+			<artifactId>sdk-rpc</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

core/ledger/ledger-rpc/pom.xml → framework/sdk/sdk-rpc/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
-		<artifactId>ledger-core</artifactId>
+		<artifactId>sdk</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>ledger-rpc</artifactId>
+	<artifactId>sdk-rpc</artifactId>
 
 	<dependencies>
 		<dependency>
@@ -36,16 +36,4 @@
 		</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>