You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/01/06 03:35:37 UTC
[incubator-dolphinscheduler] branch dev updated: move version to
parent pom (#1722)
This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 94fa1ad move version to parent pom (#1722)
94fa1ad is described below
commit 94fa1adf9bd315d96fb5ab025511fd33ad4b09f4
Author: Tboy <gu...@immomo.com>
AuthorDate: Mon Jan 6 11:35:29 2020 +0800
move version to parent pom (#1722)
---
dolphinscheduler-api/pom.xml | 12 ------------
pom.xml | 13 +++++++++++++
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index 014799b..decfd76 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -27,11 +27,6 @@
<name>${project.artifactId}</name>
<packaging>jar</packaging>
- <properties>
- <jasper-runtime.version>5.5.23</jasper-runtime.version>
- <servlet-api.version>2.5</servlet-api.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
@@ -158,11 +153,6 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<exclusions>
@@ -241,13 +231,11 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>${jasper-runtime.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 2f1727f..b545ff0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,8 @@
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
<mockito.version>2.21.0</mockito.version>
<powermock.version>2.0.2</powermock.version>
+ <jasper-runtime.version>5.5.23</jasper-runtime.version>
+ <servlet-api.version>2.5</servlet-api.version>
</properties>
<dependencyManagement>
@@ -516,6 +518,17 @@
<version>${jcip.version}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${jasper-runtime.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>