合并develop到master，3.0.6，去除taobao parent依赖

pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/maven-v4_0_0.xsd">
-
+	<!--
 	<parent>
 		<groupId>com.taobao</groupId>
 		<artifactId>parent</artifactId>
 		<version>1.0.2</version>
 	</parent>
-	<!--
+
 
 	<parent>
 		<groupId>org.sonatype.oss</groupId>