Commit 2e0cf4d0 authored by qiaozhanwei's avatar qiaozhanwei
Browse files

escheduler-common protobuffer remove and api,dao,server exclusion protobuffer

parent 26ae74cb
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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>

+8 −8
Original line number Diff line number Diff line
@@ -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>
+6 −0
Original line number Diff line number Diff line
@@ -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>
+4 −0
Original line number Diff line number Diff line
@@ -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>