Merge branch 'branch-1.0.2' of https://github.com/qiaozhanwei/EasyScheduler-1 into branch-1.0.2

escheduler-api/pom.xml

@@ -34,6 +34,10 @@
           <artifactId>leveldbjni-all</artifactId>
           <groupId>org.fusesource.leveldbjni</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>protobuf-java</artifactId>
+          <groupId>com.google.protobuf</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
 

escheduler-common/pom.xml

@@ -148,10 +148,10 @@
 					<groupId>javax.servlet.jsp</groupId>
 					<artifactId>jsp-api</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.google.protobuf</groupId>
-					<artifactId>protobuf-java</artifactId>
-				</exclusion>
+				<!--<exclusion>-->
+					<!--<groupId>com.google.protobuf</groupId>-->
+					<!--<artifactId>protobuf-java</artifactId>-->
+				<!--</exclusion>-->
 
 			</exclusions>
 		</dependency>
@@ -175,10 +175,10 @@
 					<groupId>org.codehaus.jackson</groupId>
 					<artifactId>jackson-xc</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.google.protobuf</groupId>
-					<artifactId>protobuf-java</artifactId>
-				</exclusion>
+				<!--<exclusion>-->
+					<!--<groupId>com.google.protobuf</groupId>-->
+					<!--<artifactId>protobuf-java</artifactId>-->
+				<!--</exclusion>-->
 				<exclusion>
 					<groupId>org.fusesource.leveldbjni</groupId>
 					<artifactId>leveldbjni-all</artifactId>

escheduler-dao/pom.xml

@@ -125,6 +125,12 @@
 		<dependency>
 			<groupId>cn.analysys</groupId>
 			<artifactId>escheduler-common</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>protobuf-java</artifactId>
+					<groupId>com.google.protobuf</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>org.springframework</groupId>

escheduler-server/pom.xml

@@ -18,6 +18,10 @@
 			<groupId>cn.analysys</groupId>
 			<artifactId>escheduler-common</artifactId>
 			<exclusions>
+				<exclusion>
+					<artifactId>protobuf-java</artifactId>
+					<groupId>com.google.protobuf</groupId>
+				</exclusion>
 				<exclusion>
 					<groupId>io.netty</groupId>
 					<artifactId>netty</artifactId>