Merge branch 'master' into release/0.7.0

* master:
  upgraded the versions of dependent projects;

# Conflicts:
#	pom.xml

pom.xml

@@ -2,86 +2,82 @@
 	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>
-	<groupId>com.jd.blockchain</groupId>
-	<artifactId>bft-smart</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
-
-	<!--采用sonatype的parent -->
 	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
+		<groupId>com.jd.blockchain</groupId>
+		<artifactId>jdchain-parent</artifactId>
+		<version>1.1.5.RELEASE</version>
+		<relativePath>../project/parent</relativePath>
 	</parent>
+	<artifactId>bft-smart</artifactId>
+	<version>0.6.7.RELEASE</version>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.jd.utils</groupId>
+			<artifactId>utils-common</artifactId>
+			<version>2.0.2.RELEASE</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.5</version>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.6</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
-			<version>4.1</version>
 		</dependency>
 
+		<!--<dependency> -->
+		<!--<groupId>com.yahoo.ycsb</groupId> -->
+		<!--<artifactId>core</artifactId> -->
+		<!--<version>0.1.4</version> -->
+		<!--</dependency> -->
+
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.1.42.Final</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.61</version>
 		</dependency>
 
-		<!-- <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> 
-			<version>1.7.25</version> <scope>test</scope> </dependency> -->
+		<!--<dependency> -->
+		<!--<groupId>org.slf4j</groupId> -->
+		<!--<artifactId>slf4j-jdk14</artifactId> -->
+		<!--<version>1.5.8</version> -->
+		<!--<scope>test</scope> -->
+		<!--</dependency> -->
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.23.4</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jd.utils</groupId>
-			<artifactId>utils-common</artifactId>
-            <version>2.0.1.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jd.utils</groupId>
-			<artifactId>utils-serialize</artifactId>
-            <version>2.0.1.RELEASE</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j2</artifactId>
-			<version>2.2.5.RELEASE</version>
 		</dependency>
 
-		<dependency>
-			<groupId>io.dropwizard.metrics</groupId>
-			<artifactId>metrics-core</artifactId>
-			<version>4.1.2</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 	<build>