You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/10/30 04:19:03 UTC
[shardingsphere-elasticjob] branch master updated: Adjust
dependencies of cloud and distribution (#1677)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new aa5e9c1 Adjust dependencies of cloud and distribution (#1677)
aa5e9c1 is described below
commit aa5e9c17d4cfdc6f584b0083cfa02bedeabf73d9
Author: 吴伟杰 <ro...@me.com>
AuthorDate: Fri Oct 30 11:55:45 2020 +0800
Adjust dependencies of cloud and distribution (#1677)
* Adjust dependencies of cloud and distribution
* Correct indent
---
elasticjob-cloud/elasticjob-cloud-common/pom.xml | 5 +++++
elasticjob-cloud/elasticjob-cloud-executor/pom.xml | 15 -------------
.../elasticjob-cloud-scheduler/pom.xml | 22 ------------------
.../elasticjob-cloud-executor-distribution/pom.xml | 15 +++++++++++++
.../pom.xml | 26 ----------------------
.../elasticjob-lite-distribution/pom.xml | 15 +++++++++++++
6 files changed, 35 insertions(+), 63 deletions(-)
diff --git a/elasticjob-cloud/elasticjob-cloud-common/pom.xml b/elasticjob-cloud/elasticjob-cloud-common/pom.xml
index cc56d09..c3289e6 100755
--- a/elasticjob-cloud/elasticjob-cloud-common/pom.xml
+++ b/elasticjob-cloud/elasticjob-cloud-common/pom.xml
@@ -54,6 +54,11 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-http-executor</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-registry-center</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/elasticjob-cloud/elasticjob-cloud-executor/pom.xml b/elasticjob-cloud/elasticjob-cloud-executor/pom.xml
index d78504c..01efc54 100755
--- a/elasticjob-cloud/elasticjob-cloud-executor/pom.xml
+++ b/elasticjob-cloud/elasticjob-cloud-executor/pom.xml
@@ -29,21 +29,6 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-simple-executor</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-dataflow-executor</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-script-executor</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-cloud-common</artifactId>
<version>${project.parent.version}</version>
</dependency>
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml b/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml
index 5174674..4270768 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/pom.xml
@@ -33,26 +33,6 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-infra-common</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-simple-executor</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-dataflow-executor</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-script-executor</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere.elasticjob</groupId>
<artifactId>elasticjob-cloud-common</artifactId>
<version>${project.parent.version}</version>
</dependency>
@@ -64,12 +44,10 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.12</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.13</version>
</dependency>
<dependency>
diff --git a/elasticjob-distribution/elasticjob-cloud-executor-distribution/pom.xml b/elasticjob-distribution/elasticjob-cloud-executor-distribution/pom.xml
index 8840501..b30b278 100644
--- a/elasticjob-distribution/elasticjob-cloud-executor-distribution/pom.xml
+++ b/elasticjob-distribution/elasticjob-cloud-executor-distribution/pom.xml
@@ -33,6 +33,21 @@
<artifactId>elasticjob-cloud-executor</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-error-handler-dingtalk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-error-handler-email</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-error-handler-wechat</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<profiles>
diff --git a/elasticjob-distribution/elasticjob-cloud-scheduler-distribution/pom.xml b/elasticjob-distribution/elasticjob-cloud-scheduler-distribution/pom.xml
index 8053dd1..442a030 100644
--- a/elasticjob-distribution/elasticjob-cloud-scheduler-distribution/pom.xml
+++ b/elasticjob-distribution/elasticjob-cloud-scheduler-distribution/pom.xml
@@ -27,10 +27,6 @@
<packaging>pom</packaging>
<name>${project.artifactId}</name>
- <properties>
- <springframework.version>5.2.7.RELEASE</springframework.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
@@ -70,12 +66,10 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.12</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.13</version>
</dependency>
<dependency>
@@ -118,26 +112,6 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- </dependency>
</dependencies>
<profiles>
diff --git a/elasticjob-distribution/elasticjob-lite-distribution/pom.xml b/elasticjob-distribution/elasticjob-lite-distribution/pom.xml
index 14c0c82..b43da70 100644
--- a/elasticjob-distribution/elasticjob-lite-distribution/pom.xml
+++ b/elasticjob-distribution/elasticjob-lite-distribution/pom.xml
@@ -43,6 +43,21 @@
<artifactId>elasticjob-lite-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-error-handler-dingtalk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-error-handler-email</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere.elasticjob</groupId>
+ <artifactId>elasticjob-error-handler-wechat</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<profiles>