[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 <dailidong66@gmail.com>
3 years ago · 3865a7a5da
5 changed files with 42 additions and 27 deletions
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@ -96,16 +96,24 @@
      <artifactId>commons-collections</artifactId>
    </dependency>

-    <dependency>
-      <groupId>org.quartz-scheduler</groupId>
-      <artifactId>quartz</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>c3p0</artifactId>
-          <groupId>c3p0</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <exclusions>
+              <exclusion>
+                <groupId>com.mchange</groupId>
+                <artifactId>c3p0</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.mchange</groupId>
+                <artifactId>mchange-commons-java</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.zaxxer</groupId>
+                <artifactId>HikariCP-java6</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>

    <dependency>
      <groupId>org.quartz-scheduler</groupId>
--- 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
 ========================================================================
--- a/dolphinscheduler-service/pom.xml
+++ b/dolphinscheduler-service/pom.xml
@ -55,10 +55,18 @@
            <groupId>org.quartz-scheduler</groupId>
            <artifactId>quartz</artifactId>
            <exclusions>
-                <exclusion>
-                    <artifactId>c3p0</artifactId>
-                    <groupId>c3p0</groupId>
-                </exclusion>
+              <exclusion>
+                <groupId>com.mchange</groupId>
+                <artifactId>c3p0</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.mchange</groupId>
+                <artifactId>mchange-commons-java</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.zaxxer</groupId>
+                <artifactId>HikariCP-java6</artifactId>
+              </exclusion>
            </exclusions>
        </dependency>

--- a/pom.xml
+++ b/pom.xml
@ -63,8 +63,8 @@
        <java.version>1.8</java.version>
        <logback.version>1.2.3</logback.version>
        <hadoop.version>2.7.3</hadoop.version>
-        <quartz.version>2.2.3</quartz.version>
-        <jackson.version>2.9.8</jackson.version>
+        <quartz.version>2.3.0</quartz.version>
+        <jackson.version>2.9.10</jackson.version>
        <mybatis-plus.version>3.2.0</mybatis-plus.version>
        <mybatis.spring.version>2.0.1</mybatis.spring.version>
        <cron.utils.version>5.0.5</cron.utils.version>
--- 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