github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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

pull/2/head
qiaozhanwei 6 years ago
parent
21eb6f70a3 2e0cf4d071
commit
d2498ad02d
4 changed files with 22 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      escheduler-api/pom.xml
  2. 16
      escheduler-common/pom.xml
  3. 6
      escheduler-dao/pom.xml
  4. 4
      escheduler-server/pom.xml

4
escheduler-api/pom.xml
Unescape View File

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

16
escheduler-common/pom.xml
Unescape View File

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

6
escheduler-dao/pom.xml
Unescape View File

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

4
escheduler-server/pom.xml
Unescape View File

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

Write Preview
Loading…
Cancel
Save