From 3865a7a5daea3356480f903b4ff8a98fed2bf56f Mon Sep 17 00:00:00 2001 From: lgcareer <18610854716@163.com> Date: Tue, 8 Dec 2020 14:40:32 +0800 Subject: [PATCH] [Fix-4143][api,service][jar upgrade]cherry from dev to upgrade quartz version to 2.3.0 (#4173) * [Fix-4143][api,service][jar upgrade]cherry from dev to upgrade quartz version to 2.3.0 * [Fix-4143][api,service][jar upgrade]cherry from dev to upgrade quartz version to 2.3.0 * [Fix-4143][api,service][jar upgrade]cherry from dev to upgrade quartz version to 2.3.0 * [Fix-4143][api,service][jar upgrade]cherry from dev to upgrade quartz version to 2.3.0 * [Fix-4143][api,service][jar upgrade]cherry from dev to upgrade quartz version to 2.3.0 Co-authored-by: dailidong --- dolphinscheduler-api/pom.xml | 28 ++++++++++++++-------- dolphinscheduler-dist/release-docs/LICENSE | 11 ++++----- dolphinscheduler-service/pom.xml | 16 +++++++++---- pom.xml | 4 ++-- tools/dependencies/known-dependencies.txt | 10 ++++---- 5 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index e6dae1def3..82a6a7c251 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -96,16 +96,24 @@ commons-collections - - org.quartz-scheduler - quartz - - - c3p0 - c3p0 - - - + + org.quartz-scheduler + quartz + + + com.mchange + c3p0 + + + com.mchange + mchange-commons-java + + + com.zaxxer + HikariCP-java6 + + + org.quartz-scheduler diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index 1acee57452..71d3f9a548 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -287,10 +287,10 @@ The text of each license is also included at licenses/LICENSE-[project].txt. httpclient 4.4.1: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.4.1, Apache 2.0 httpcore 4.4.1: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.1, Apache 2.0 httpmime 4.5.7: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime/4.5.7, Apache 2.0 - jackson-annotations 2.9.8: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.9.8, Apache 2.0 - jackson-core 2.9.8: https://github.com/FasterXML/jackson-core, Apache 2.0 + jackson-annotations 2.9.10: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.9.10, Apache 2.0 + jackson-core 2.9.10: https://github.com/FasterXML/jackson-core, Apache 2.0 jackson-core-asl 1.9.13: https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-core-asl/1.9.13, Apache 2.0 - jackson-databind 2.9.8: https://github.com/FasterXML/jackson-databind, Apache 2.0 + jackson-databind 2.9.10: https://github.com/FasterXML/jackson-databind, Apache 2.0 jackson-datatype-jdk8 2.9.8: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.9.8, Apache 2.0 jackson-datatype-jsr310 2.9.8: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.9.8, Apache 2.0 jackson-jaxrs 1.9.13: https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-jaxrs/1.9.13, Apache 2.0 and LGPL 2.1 @@ -343,8 +343,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt. opencsv 2.3: https://mvnrepository.com/artifact/net.sf.opencsv/opencsv/2.3, Apache 2.0 parquet-hadoop-bundle 1.8.1: https://mvnrepository.com/artifact/org.apache.parquet/parquet-hadoop-bundle/1.8.1, Apache 2.0 poi 3.17: https://mvnrepository.com/artifact/org.apache.poi/poi/3.17, Apache 2.0 - quartz 2.2.3: https://mvnrepository.com/artifact/org.quartz-scheduler/quartz/2.2.3, Apache 2.0 - quartz-jobs 2.2.3: https://mvnrepository.com/artifact/org.quartz-scheduler/quartz-jobs/2.2.3, Apache 2.0 + quartz 2.3.0: https://mvnrepository.com/artifact/org.quartz-scheduler/quartz/2.3.0, Apache 2.0 + quartz-jobs 2.3.0: https://mvnrepository.com/artifact/org.quartz-scheduler/quartz-jobs/2.3.0, Apache 2.0 snakeyaml 1.23: https://mvnrepository.com/artifact/org.yaml/snakeyaml/1.23, Apache 2.0 snappy 0.2: https://mvnrepository.com/artifact/org.iq80.snappy/snappy/0.2, Apache 2.0 snappy-java 1.0.4.1: https://github.com/xerial/snappy-java, Apache 2.0 @@ -385,7 +385,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt. xml-apis 1.4.01: https://mvnrepository.com/artifact/xml-apis/xml-apis/1.4.01, Apache 2.0 and W3C zookeeper 3.4.14: https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper/3.4.14, Apache 2.0 - ======================================================================== BSD licenses ======================================================================== diff --git a/dolphinscheduler-service/pom.xml b/dolphinscheduler-service/pom.xml index 4ea69ab136..f3f5c46ddb 100644 --- a/dolphinscheduler-service/pom.xml +++ b/dolphinscheduler-service/pom.xml @@ -55,10 +55,18 @@ org.quartz-scheduler quartz - - c3p0 - c3p0 - + + com.mchange + c3p0 + + + com.mchange + mchange-commons-java + + + com.zaxxer + HikariCP-java6 + diff --git a/pom.xml b/pom.xml index 072ec13229..57a3c95cc7 100644 --- a/pom.xml +++ b/pom.xml @@ -63,8 +63,8 @@ 1.8 1.2.3 2.7.3 - 2.2.3 - 2.9.8 + 2.3.0 + 2.9.10 3.2.0 2.0.1 5.0.5 diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 63f3616e0a..e684b7a05a 100755 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -77,10 +77,10 @@ htrace-core-3.1.0-incubating.jar httpclient-4.4.1.jar httpcore-4.4.1.jar httpmime-4.5.7.jar -jackson-annotations-2.9.8.jar -jackson-core-2.9.8.jar +jackson-annotations-2.9.10.jar +jackson-core-2.9.10.jar jackson-core-asl-1.9.13.jar -jackson-databind-2.9.8.jar +jackson-databind-2.9.10.jar jackson-datatype-jdk8-2.9.8.jar jackson-datatype-jsr310-2.9.8.jar jackson-jaxrs-1.9.13.jar @@ -161,8 +161,8 @@ parquet-hadoop-bundle-1.8.1.jar poi-3.17.jar postgresql-42.1.4.jar protobuf-java-2.5.0.jar -quartz-2.2.3.jar -quartz-jobs-2.2.3.jar +quartz-2.3.0.jar +quartz-jobs-2.3.0.jar slf4j-api-1.7.5.jar snakeyaml-1.23.jar snappy-0.2.jar