diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index b0d6b7392276007df8cfd897d51682b09ce94f05..b128ecd42481b4a6e78e9d7ff3314b77da5cf734 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -8,6 +8,11 @@ dolphinscheduler-api jar + + 5.5.23 + 2.5 + + org.apache.dolphinscheduler @@ -183,6 +188,49 @@ 4.12 test + + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-client + + + org.apache.hadoop + hadoop-hdfs + + + org.apache.hadoop + hadoop-yarn-common + + + org.apache.hadoop + hadoop-aws + + + + tomcat + jasper-runtime + ${jasper-runtime.version} + + + + javax.servlet + servlet-api + ${servlet-api.version} + + diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java index c7ec39ebf1fb9e72ca74bee43d90e213597fc49e..f741b88e74dc3ff53457805e684cd716a3c3ad04 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java @@ -133,7 +133,7 @@ public class ZooKeeperState { public void run() { try { ret = FourLetterWordMain.send4LetterWord(host, port, cmd); - } catch (IOException e) { + } catch (Exception e) { logger.error(e.getMessage(),e); return; } diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml index a79d561bf9a4e330c323ffda308453d18e85776b..a5c6700f0b1edd376e842381383fcaf36e71a538 100644 --- a/dolphinscheduler-common/pom.xml +++ b/dolphinscheduler-common/pom.xml @@ -566,16 +566,16 @@ - - org.mortbay.jetty - jsp-2.1 - - - org.mortbay.jetty - servlet-api-2.5 - - - + + + + + + + + + + com.baomidou mybatis-plus-annotation diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java index c07fd05da22d22445e6065c6834d63316dab90ec..c67f4d581f7279780caf3d8c9ca8924f9e92a356 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java @@ -26,7 +26,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.mortbay.jetty.servlet.AbstractSessionIdManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; diff --git a/dolphinscheduler-server/pom.xml b/dolphinscheduler-server/pom.xml index 8aaffc6c12287bff0c4b36526fa3cb3a00ee0739..260498d9d9eec9245f575e15e03fe4acea290b62 100644 --- a/dolphinscheduler-server/pom.xml +++ b/dolphinscheduler-server/pom.xml @@ -69,6 +69,10 @@ org.apache.curator curator-recipes + + org.apache.zookeeper + zookeeper + org.apache.httpcomponents diff --git a/pom.xml b/pom.xml index e72753d8fd819e6289f4d6125b1de855fb619b40..85aff682c6595d308f85f4c272ef95970bf938e5 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,7 @@ 6.1.14 3.1.12 0.13 + 3.5.6 @@ -190,6 +191,21 @@ curator-recipes ${curator.version} + + org.apache.zookeeper + zookeeper + + + org.slf4j + slf4j-log4j12 + + + netty + io.netty + + + ${zookeeper.version} + commons-codec @@ -406,11 +422,11 @@ ${mssql.jdbc.version} - - org.mortbay.jetty - jsp-2.1 - ${jsp.version} - + + + + + net.jcip