From 2e0cf4d0718d2fcd7e2343b97ff291398ab79656 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Date: Thu, 23 May 2019 14:23:22 +0800
Subject: [PATCH] =?UTF-8?q?escheduler-common=20protobuffer=20remove=20and?=
 =?UTF-8?q?=20api=EF=BC=8Cdao=EF=BC=8Cserver=20exclusion=20protobuffer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 escheduler-api/pom.xml    |  4 ++++
 escheduler-common/pom.xml | 16 ++++++++--------
 escheduler-dao/pom.xml    |  6 ++++++
 escheduler-server/pom.xml |  4 ++++
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/escheduler-api/pom.xml b/escheduler-api/pom.xml
index bfa01dba1..73a392774 100644
--- a/escheduler-api/pom.xml
+++ b/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>
 
diff --git a/escheduler-common/pom.xml b/escheduler-common/pom.xml
index 4f76b55ca..afe34dbd3 100644
--- a/escheduler-common/pom.xml
+++ b/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>
diff --git a/escheduler-dao/pom.xml b/escheduler-dao/pom.xml
index ca489b210..39536fb04 100644
--- a/escheduler-dao/pom.xml
+++ b/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>
diff --git a/escheduler-server/pom.xml b/escheduler-server/pom.xml
index 3047296e0..00164f523 100644
--- a/escheduler-server/pom.xml
+++ b/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>
-- 
GitLab