Merge branch 'develop' into feature/authorize

source/base/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>base</artifactId>
 

source/binary-proto/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>binary-proto</artifactId>
 

source/consensus/consensus-bftsmart/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>consensus</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>consensus-bftsmart</artifactId>
 

source/consensus/consensus-framework/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>consensus</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>consensus-framework</artifactId>
 

source/consensus/consensus-mq/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>consensus</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>consensus-mq</artifactId>
 

source/consensus/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>consensus</artifactId>
 	<packaging>pom</packaging>

source/contract/contract-framework/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>contract</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>contract-framework</artifactId>
 

source/contract/contract-jvm/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>contract</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>contract-jvm</artifactId>
 

source/contract/contract-maven-plugin/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>contract</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>contract-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>

source/contract/contract-samples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>contract</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.0.0.RELEASE</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

source/contract/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>contract</artifactId>
 	<packaging>pom</packaging>

source/crypto/crypto-adv/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>crypto</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>crypto-adv</artifactId>
 

source/crypto/crypto-classic/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>crypto</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>crypto-classic</artifactId>
 

source/crypto/crypto-framework/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>crypto</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>crypto-framework</artifactId>
 

source/crypto/crypto-pki/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>crypto</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.0.0.RELEASE</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

source/crypto/crypto-sm/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>crypto</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>crypto-sm</artifactId>
 

source/crypto/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>crypto</artifactId>
 	<packaging>pom</packaging>

source/deployment/deployment-gateway/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deployment</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>deployment-gateway</artifactId>
 

source/deployment/deployment-peer/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deployment</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>deployment-peer</artifactId>
 

source/deployment/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>deployment</artifactId>
 	<packaging>pom</packaging>

source/gateway/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>gateway</artifactId>
 

source/ledger/ledger-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>ledger</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ledger-core</artifactId>
 

source/ledger/ledger-model/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>ledger</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ledger-model</artifactId>
 

source/ledger/ledger-rpc/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>ledger</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ledger-rpc</artifactId>
 

source/ledger/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ledger</artifactId>
 	<packaging>pom</packaging>

source/peer/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>peer</artifactId>
 

source/pom.xml

@@ -16,7 +16,7 @@
 
 	<groupId>com.jd.blockchain</groupId>
 	<artifactId>jdchain-root</artifactId>
-	<version>1.0.0.RELEASE</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<description>jdchain</description>
 

source/runtime/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>runtime</artifactId>
 	<packaging>pom</packaging>

source/runtime/runtime-context/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>runtime</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>runtime-context</artifactId>
 

source/runtime/runtime-modular-booter/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>runtime</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>runtime-modular-booter</artifactId>
 </project>

source/runtime/runtime-modular/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>runtime</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>runtime-modular</artifactId>
 

source/sdk/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sdk</artifactId>
 	<packaging>pom</packaging>

source/sdk/sdk-base/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>sdk</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sdk-base</artifactId>
 
@@ -51,13 +51,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 	<!-- <build> <plugins> <plugin> <groupId>org.springframework.boot</groupId> 

source/sdk/sdk-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>sdk</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sdk-client</artifactId>
 

source/sdk/sdk-samples/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>sdk</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sdk-samples</artifactId>
 

source/storage/pom.xml

@@ -3,7 +3,7 @@
   <parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
   <artifactId>storage</artifactId>
   <packaging>pom</packaging>

source/storage/storage-composite/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>storage</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>storage-composite</artifactId>
 

source/storage/storage-redis/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>storage</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>storage-redis</artifactId>
 
@@ -37,10 +37,6 @@
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
 
 	</dependencies>
 </project>

source/storage/storage-rocksdb/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>storage</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>storage-rocksdb</artifactId>
 

source/storage/storage-service/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>storage</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>storage-service</artifactId>
 
@@ -15,16 +15,5 @@
 			<artifactId>utils-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>

source/test/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>test</artifactId>
 	<packaging>pom</packaging>

source/test/test-consensus-client/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>test</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>test-consensus-client</artifactId>
 

source/test/test-consensus-node/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>test</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>test-consensus-node</artifactId>
 	<dependencies>
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.jd.blockchain</groupId>
 			<artifactId>consensus-bftsmart</artifactId>
-			<version>1.0.0.RELEASE</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

source/test/test-integration/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>test</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>test-integration</artifactId>
 

source/test/test-ledger-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>test</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>test-ledger-core</artifactId>
 

source/tools/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tools</artifactId>
 	<packaging>pom</packaging>

source/tools/tools-capability/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tools</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.0.0.RELEASE</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

source/tools/tools-initializer-booter/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>tools</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tools-initializer-booter</artifactId>
 

source/tools/tools-initializer/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>tools</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tools-initializer</artifactId>
 

source/tools/tools-keygen-booter/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>tools</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tools-keygen-booter</artifactId>
 

source/tools/tools-keygen/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>tools</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>tools-keygen</artifactId>
 

source/tools/tools-mocker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tools</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.0.0.RELEASE</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

source/utils/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>utils</artifactId>
 	<packaging>pom</packaging>

source/utils/utils-common/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>utils</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>utils-common</artifactId>
 

source/utils/utils-http/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>utils</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>

source/utils/utils-serialize/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>utils</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>utils-serialize</artifactId>
 

source/utils/utils-test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>utils</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>utils-test</artifactId>
 

source/utils/utils-web-server/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>utils</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>utils-web-server</artifactId>
 

source/utils/utils-web/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>utils</artifactId>
-		<version>1.0.0.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>utils-web</artifactId>
 	<dependencies>