From 105773f54d3bc10af4284a9457a21c6f40944341 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Sat, 10 Sep 2022 22:54:38 +0800 Subject: [PATCH] Remove htrace dependencies (#11881) * Remove htrace dependencies * Update pom.xml --- docs/docs/en/faq.md | 2 +- docs/docs/zh/faq.md | 2 +- dolphinscheduler-bom/pom.xml | 121 +++++++++-- dolphinscheduler-data-quality/pom.xml | 79 +++---- dolphinscheduler-dist/pom.xml | 34 ++- dolphinscheduler-dist/release-docs/LICENSE | 40 ++-- dolphinscheduler-dist/release-docs/NOTICE | 14 +- .../licenses/LICENSE-htrace-core4.txt | 202 ------------------ .../licenses/LICENSE-slf4j-reload4j.txt | 24 --- dolphinscheduler-master/pom.xml | 8 + pom.xml | 7 +- tools/dependencies/known-dependencies.txt | 36 ++-- 12 files changed, 213 insertions(+), 356 deletions(-) delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-htrace-core4.txt delete mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-slf4j-reload4j.txt diff --git a/docs/docs/en/faq.md b/docs/docs/en/faq.md index 339d516b38..5981f47cf3 100644 --- a/docs/docs/en/faq.md +++ b/docs/docs/en/faq.md @@ -280,7 +280,7 @@ A ： Will hive pom org.apache.hive hive-jdbc - 2.3.3 + 2.3.9 ``` diff --git a/docs/docs/zh/faq.md b/docs/docs/zh/faq.md index 745422ca87..3b7c56ab52 100644 --- a/docs/docs/zh/faq.md +++ b/docs/docs/zh/faq.md @@ -251,7 +251,7 @@ A： 将 hive pom org.apache.hive hive-jdbc - 2.3.3 + 2.3.9 ``` diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index 5061d5c719..4ce1938b3d 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -51,7 +51,7 @@ 4.1 4.5.13 4.4.15 - 2.13.0 + 2.13.4 1.7.2 1.9.16 1.2.11 @@ -65,9 +65,9 @@ 3.1.0 1.1 1.6.2 - 24.1-jre + 31.1-jre 42.4.1 - 2.3.3 + 2.3.9 2.11.0 6.1.1 0.1.52 @@ -92,6 +92,9 @@ 2.9.1 4.2.11 1.1.8.4 + 3.2.2 + 3.0.16 + 1.31 @@ -420,6 +423,18 @@ ${poi.version} + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + com.squareup.okhttp3 + mockwebserver + ${okhttp.version} + test + + org.apache.hadoop @@ -442,6 +457,10 @@ javax.servlet servlet-api + + org.slf4j + slf4j-reload4j + @@ -460,6 +479,20 @@ ${hadoop.version} + + org.apache.htrace + htrace-core4 + provided + + + + + + org.apache.hbase.thirdparty + hbase-noop-htrace + ${htrace.version} + + org.apache.commons commons-collections4 @@ -482,6 +515,12 @@ org.apache.hive hive-jdbc ${hive-jdbc.version} + + + org.apache.orc + orc-core + + @@ -614,17 +653,6 @@ ${aws-sdk.version} - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - com.squareup.okhttp3 - mockwebserver - ${okhttp.version} - test - com.jayway.jsonpath json-path @@ -664,7 +692,70 @@ gson ${gson.version} - + + org.slf4j + slf4j-reload4j + provided + + + + org.apache.spark + spark-core_2.12 + ${spark.version} + + + com.fasterxml.jackson.module + jackson-module-scala_2.11 + + + + + + org.apache.spark + spark-sql_2.12 + ${spark.version} + + + com.fasterxml.jackson.core + jackson-core + + + + + org.apache.spark + spark-hive_2.12 + ${spark.version} + + + commons-httpclient + commons-httpclient + + + org.apache.httpcomponents + httpclient + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + + + + org.codehaus.janino + janino + ${janino.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + diff --git a/dolphinscheduler-data-quality/pom.xml b/dolphinscheduler-data-quality/pom.xml index 0147089c1d..8634ec99ff 100644 --- a/dolphinscheduler-data-quality/pom.xml +++ b/dolphinscheduler-data-quality/pom.xml @@ -15,59 +15,60 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler + dolphinscheduler dev-SNAPSHOT - 4.0.0 dolphinscheduler-data-quality - dolphinscheduler-data-quality jar + dolphinscheduler-data-quality - - 2.12 - 3.2.2 - 2.13.0 - 2.13.0 - provided - + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + org.apache.spark - spark-core_${scala.binary.version} - ${spark.version} - ${scope} + spark-core_2.12 + provided - jackson-module-scala_2.11 com.fasterxml.jackson.module + jackson-module-scala_2.11 org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version} - ${scope} + spark-sql_2.12 + provided - jackson-core com.fasterxml.jackson.core + jackson-core org.apache.spark - spark-hive_${scala.binary.version} - ${spark.version} + spark-hive_2.12 + provided commons-httpclient @@ -78,15 +79,14 @@ httpclient - jackson-core-asl org.codehaus.jackson + jackson-core-asl - jackson-mapper-asl org.codehaus.jackson + jackson-mapper-asl - ${scope} @@ -110,8 +110,8 @@ clickhouse-jdbc - jackson-core com.fasterxml.jackson.core + jackson-core @@ -121,8 +121,8 @@ mssql-jdbc - azure-keyvault com.microsoft.azure + azure-keyvault @@ -140,12 +140,11 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.databind.version} - ${scope} + provided - jackson-core com.fasterxml.jackson.core + jackson-core @@ -153,12 +152,11 @@ com.fasterxml.jackson.module jackson-module-scala_2.11 - ${jackson.version} - ${scope} + provided - jackson-core com.fasterxml.jackson.core + jackson-core @@ -166,21 +164,8 @@ org.codehaus.janino janino - 3.0.8 - ${scope} + provided - - - - - org.apache.dolphinscheduler - dolphinscheduler-bom - ${project.version} - pom - import - - - diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index ba14b46576..22316a261a 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -15,14 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - + + 4.0.0 - dolphinscheduler org.apache.dolphinscheduler + dolphinscheduler dev-SNAPSHOT - 4.0.0 dolphinscheduler-dist ${project.artifactId} @@ -30,6 +30,18 @@ true + + + + org.apache.dolphinscheduler + dolphinscheduler-bom + ${project.version} + pom + import + + + + org.apache.dolphinscheduler @@ -72,6 +84,10 @@ + + apache-dolphinscheduler-${project.version} + + release @@ -82,10 +98,10 @@ dolphinscheduler-bin - package single + package @@ -97,10 +113,10 @@ src - package single + package src/main/assembly/dolphinscheduler-src.xml @@ -125,10 +141,10 @@ python - package single + package python @@ -145,8 +161,4 @@ - - - apache-dolphinscheduler-${project.version} - diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index aecabfc734..bfb41a08fe 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -216,7 +216,7 @@ The following components are provided under the Apache License. See project link The text of each license is also included at licenses/LICENSE-[project].txt. accessors-smart 2.4.8: https://github.com/netplex/json-smart-v2, Apache 2.0 - aircompressor 0.3 https://mvnrepository.com/artifact/io.airlift/aircompressor, Apache 2.0 + failureaccess 1.0.1: https://mvnrepository.com/artifact/com.google.guava/failureaccess/1.0.1, Apache 2.0 tomcat-embed-el 9.0.65: https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-el/9.0.65, Apache 2.0 audience-annotations 0.12.0: https://mvnrepository.com/artifact/org.apache.yetus/audience-annotations/0.12.0, Apache 2.0 avro 1.7.7: https://github.com/apache/avro, Apache 2.0 @@ -257,7 +257,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. metrics-core 4.2.11: https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core, Apache 2.0 error_prone_annotations 2.1.3 https://mvnrepository.com/artifact/com.google.errorprone/error_prone_annotations/2.1.3, Apache 2.0 gson 2.9.1: https://github.com/google/gson, Apache 2.0 - guava 24.1-jre: https://mvnrepository.com/artifact/com.google.guava/guava/24.1-jre, Apache 2.0 + guava 31.1-jre: https://mvnrepository.com/artifact/com.google.guava/guava/31.1-jre, Apache 2.0 guava-retrying 2.0.0: https://mvnrepository.com/artifact/com.github.rholder/guava-retrying/2.0.0, Apache 2.0 hadoop-annotations 3.2.4:https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-annotations/3.2.4, Apache 2.0 hadoop-auth 3.2.4: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-auth/3.2.4, Apache 2.0 @@ -272,21 +272,20 @@ The text of each license is also included at licenses/LICENSE-[project].txt. hadoop-yarn-client 3.2.4: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-yarn-client/3.2.4, Apache 2.0 hadoop-yarn-common 3.2.4: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-yarn-common/3.2.4, Apache 2.0 HikariCP 4.0.3: https://mvnrepository.com/artifact/com.zaxxer/HikariCP/4.0.3, Apache 2.0 - hive-common 2.3.3: https://mvnrepository.com/artifact/org.apache.hive/hive-common/2.3.3, Apache 2.0 - hive-jdbc 2.3.3: https://mvnrepository.com/artifact/org.apache.hive/hive-jdbc/2.3.3, Apache 2.0 - hive-metastore 2.3.3: https://mvnrepository.com/artifact/org.apache.hive/hive-metastore/2.3.3, Apache 2.0 - hive-serde 2.3.3: https://mvnrepository.com/artifact/org.apache.hive/hive-serde/2.3.3, Apache 2.0 - hive-service 2.3.3: https://mvnrepository.com/artifact/org.apache.hive/hive-service/2.3.3, Apache 2.0 - hive-service-rpc 2.3.3: https://mvnrepository.com/artifact/org.apache.hive/hive-service-rpc/2.3.3, Apache 2.0 + hive-common 2.3.9: https://mvnrepository.com/artifact/org.apache.hive/hive-common/2.3.9, Apache 2.0 + hive-jdbc 2.3.9: https://mvnrepository.com/artifact/org.apache.hive/hive-jdbc/2.3.9, Apache 2.0 + hive-metastore 2.3.9: https://mvnrepository.com/artifact/org.apache.hive/hive-metastore/2.3.9, Apache 2.0 + hive-serde 2.3.9: https://mvnrepository.com/artifact/org.apache.hive/hive-serde/2.3.9, Apache 2.0 + hive-service 2.3.9: https://mvnrepository.com/artifact/org.apache.hive/hive-service/2.3.9, Apache 2.0 + hive-service-rpc 2.3.9: https://mvnrepository.com/artifact/org.apache.hive/hive-service-rpc/2.3.9, Apache 2.0 hive-storage-api 2.4.0: https://mvnrepository.com/artifact/org.apache.hive/hive-storage-api/2.4.0, Apache 2.0 - htrace-core4 4.1.0-incubating: https://mvnrepository.com/artifact/org.apache.htrace/htrace-core4/4.1.0-incubating, Apache 2.0 httpclient 4.5.13: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.5.13, Apache 2.0 httpcore 4.4.15: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.15, Apache 2.0 httpmime 4.5.13: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpmime/4.5.13, Apache 2.0 - jackson-annotations 2.13.0: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.13.0, Apache 2.0 - jackson-core 2.13.0: https://github.com/FasterXML/jackson-core, Apache 2.0 + jackson-annotations 2.13.4: https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.13.4, Apache 2.0 + jackson-core 2.13.4: 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.13.0: https://github.com/FasterXML/jackson-databind, Apache 2.0 + jackson-databind 2.13.4: https://github.com/FasterXML/jackson-databind, Apache 2.0 jackson-datatype-jdk8 2.13.0: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.0, Apache 2.0 jackson-datatype-jsr310 2.13.0: https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.0, Apache 2.0 jackson-mapper-asl 1.9.13: https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl/1.9.13, Apache 2.0 @@ -314,7 +313,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. json-smart 2.4.8: https://github.com/netplex/json-smart-v2, Apache 2.0 jsqlparser 4.4: https://github.com/JSQLParser/JSqlParser, Apache 2.0 or LGPL 4.4 jsr305 3.0.0: https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305, Apache 2.0 - j2objc-annotations 1.1 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.1, Apache 2.0 + j2objc-annotations 1.3 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.3, Apache 2.0 kerb-admin 1.0.1: https://mvnrepository.com/artifact/org.apache.kerby/kerb-admin/1.0.1, Apache 2.0 kerb-client 1.0.1: https://mvnrepository.com/artifact/org.apache.kerby/kerb-client/1.0.1, Apache 2.0 kerb-common 1.0.1: https://mvnrepository.com/artifact/org.apache.kerby/kerb-common/1.0.1, Apache 2.0 @@ -346,16 +345,15 @@ The text of each license is also included at licenses/LICENSE-[project].txt. netty 3.10.6.Final: https://github.com/netty/netty, Apache 2.0 netty 4.1.53.Final: https://github.com/netty/netty/blob/netty-4.1.53.Final/LICENSE.txt, Apache 2.0 nimbus-jose-jwt 9.8.1: https://mvnrepository.com/artifact/com.nimbusds/nimbus-jose-jwt/9.8.1, Apache 2.0 - okhttp 2.7.5: https://mvnrepository.com/artifact/com.squareup.okhttp/okhttp/2.7.5, Apache 2.0 + okhttp 3.14.9: https://mvnrepository.com/artifact/com.squareup.okhttp/okhttp/3.14.9, Apache 2.0 opencsv 2.3: https://mvnrepository.com/artifact/net.sf.opencsv/opencsv/2.3, Apache 2.0 - orc-core 1.3.3 https://mvnrepository.com/artifact/org.apache.orc/orc-core, 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 4.1.2: https://mvnrepository.com/artifact/org.apache.poi/poi/4.1.2, Apache 2.0 poi-ooxml 4.1.2: https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml/4.1.2, Apache 2.0 poi-ooxml-schemas-4.1.2: https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas/4.1.2, Apache 2.0 quartz 2.3.2: https://mvnrepository.com/artifact/org.quartz-scheduler/quartz/2.3.2, Apache 2.0 reload4j 1.2.18.3: https://mvnrepository.com/artifact/ch.qos.reload4j/reload4j/1.2.18.3, Apache 2.0 - snakeyaml 1.30: https://mvnrepository.com/artifact/org.yaml/snakeyaml/1.30, Apache 2.0 + snakeyaml 1.31: https://mvnrepository.com/artifact/org.yaml/snakeyaml/1.31, Apache 2.0 snappy-java 1.1.8.4: https://github.com/xerial/snappy-java, Apache 2.0 SparseBitSet 1.2: https://mvnrepository.com/artifact/com.zaxxer/SparseBitSet/1.2, Apache 2.0 spring-aop 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-aop/5.3.13, Apache 2.0 @@ -499,8 +497,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt. threetenbp 1.3.6: https://mvnrepository.com/artifact/org.threeten/threetenbp/1.3.6, BSD 3-clause py4j 0.10.9: https://mvnrepository.com/artifact/net.sf.py4j/py4j/0.10.9, BSD 2-clause LatencyUtils 2.0.3: https://github.com/LatencyUtils/LatencyUtils, BSD-2-Clause - janino 3.1.7: https://mvnrepository.com/artifact/org.codehaus.janino/janino/3.1.7, BSD 3-clause - commons-compiler 3.1.7: https://mvnrepository.com/artifact/org.codehaus.janino/janino/3.1.7, BSD 3-clause + janino 3.0.16: https://mvnrepository.com/artifact/org.codehaus.janino/janino/3.0.16, BSD 3-clause + commons-compiler 3.1.7: https://mvnrepository.com/artifact/org.codehaus.janino/janino/3.0.16, BSD 3-clause automaton 1.11-8 https://mvnrepository.com/artifact/dk.brics.automaton/automaton/1.11-8, BSD 2-clause protobuf-java 3.17.2: https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java/3.17.2 BSD 3-clause protobuf-java-util 3.17.2: https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util/3.17.2 BSD 3-clause @@ -549,10 +547,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt. mssql-jdbc 6.1.0.jre8: https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc/6.1.0.jre8, MIT ruamel.yaml 0.17: https://sourceforge.net/projects/ruamel-yaml, MIT slf4j-api 1.7.36: https://mvnrepository.com/artifact/org.slf4j/slf4j-api/1.7.36, MIT - slf4j-reload4j 1.7.35: https://mvnrepository.com/artifact/org.slf4j/slf4j-reload4j/1.7.35, MIT - animal-sniffer-annotations 1.14 https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.14, MIT - checker-compat-qual 2.0.0 https://mvnrepository.com/artifact/org.checkerframework/checker-compat-qual/2.0.0, MIT + GPLv2 - checker-qual 3.19.0 https://mvnrepository.com/artifact/org.checkerframework/checker-qual/3.19.0, MIT + GPLv2 + animal-sniffer-annotations 1.19 https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.19, MIT + checker-qual 3.12.0 https://mvnrepository.com/artifact/org.checkerframework/checker-qual/3.12.0, MIT + GPLv2 Java-WebSocket 1.5.1: https://github.com/TooTallNate/Java-WebSocket MIT oshi-core 6.1.1: https://mvnrepository.com/artifact/com.github.oshi/oshi-core/6.1.1, MIT unirest-java 3.7.04-standalone: https://mvnrepository.com/artifact/com.konghq/unirest-java/3.7.04, MIT diff --git a/dolphinscheduler-dist/release-docs/NOTICE b/dolphinscheduler-dist/release-docs/NOTICE index ef6a6c0044..18a684fb87 100644 --- a/dolphinscheduler-dist/release-docs/NOTICE +++ b/dolphinscheduler-dist/release-docs/NOTICE @@ -1408,18 +1408,6 @@ This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net ========================================================================= - -htrace-core NOTICE - - -========================================================================= -Copyright 2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -========================================================================= - - Hadoop NOTICE ========================================================================= @@ -2107,4 +2095,4 @@ perfmark NOTICE * LICENSE: * agent/src/main/resources/io/perfmark/agent/third_party/asm/LICENSE (BSD style License) * HOMEPAGE: - * https://asm.ow2.io/ \ No newline at end of file + * https://asm.ow2.io/ diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-htrace-core4.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-htrace-core4.txt deleted file mode 100644 index d645695673..0000000000 --- a/dolphinscheduler-dist/release-docs/licenses/LICENSE-htrace-core4.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-slf4j-reload4j.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-slf4j-reload4j.txt deleted file mode 100644 index 1a3d053237..0000000000 --- a/dolphinscheduler-dist/release-docs/licenses/LICENSE-slf4j-reload4j.txt +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index d204d987fd..dcb8203a22 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -144,6 +144,10 @@ log4j log4j + + org.slf4j + slf4j-reload4j + @@ -236,6 +240,10 @@ com.sun.jersey jersey-core + + org.slf4j + slf4j-reload4j + diff --git a/pom.xml b/pom.xml index 1e50eb29c9..8000b56ada 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 3.2.0 2.0.9 3.0.0 - 7.0.4 + 7.1.2 1.18.20 apache ${project.name} @@ -446,10 +446,15 @@ package ${docker.build.skip} + + 1 + docker ${project.basedir} + buildx build + --load --no-cache -t ${docker.hub}/${docker.repo}:${docker.tag} diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index bbfa7c9fcb..00b2d66abe 100644 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -5,8 +5,7 @@ LatencyUtils-2.0.3.jar SparseBitSet-1.2.jar accessors-smart-2.4.8.jar activation-1.1.jar -aircompressor-0.3.jar -animal-sniffer-annotations-1.14.jar +animal-sniffer-annotations-1.19.jar annotations-13.0.jar asm-9.1.jar aspectjweaver-1.9.7.jar @@ -23,7 +22,7 @@ bcprov-jdk15on-1.68.jar bonecp-0.8.0.RELEASE.jar byte-buddy-1.9.16.jar caffeine-2.9.3.jar -checker-compat-qual-2.0.0.jar +checker-qual-3.12.0.jar checker-qual-3.19.0.jar checker-qual-3.5.0.jar classgraph-4.8.83.jar @@ -62,9 +61,10 @@ derby-10.14.2.0.jar dnsjava-2.1.7.jar druid-1.2.4.jar error_prone_annotations-2.5.1.jar +failureaccess-1.0.1.jar generex-1.0.2.jar gson-2.9.1.jar -guava-24.1-jre.jar +guava-31.1-jre.jar guava-retrying-2.0.0.jar h2-2.1.210.jar hadoop-annotations-3.2.4.jar @@ -79,25 +79,24 @@ hadoop-yarn-api-3.2.4.jar hadoop-yarn-client-3.2.4.jar hadoop-yarn-common-3.2.4.jar hibernate-validator-6.2.2.Final.jar -hive-common-2.3.3.jar -hive-jdbc-2.3.3.jar -hive-metastore-2.3.3.jar -hive-serde-2.3.3.jar -hive-service-2.3.3.jar -hive-service-rpc-2.3.3.jar +hive-common-2.3.9.jar +hive-jdbc-2.3.9.jar +hive-metastore-2.3.9.jar +hive-serde-2.3.9.jar +hive-service-2.3.9.jar +hive-service-rpc-2.3.9.jar hive-storage-api-2.4.0.jar -htrace-core4-4.1.0-incubating.jar httpasyncclient-4.1.5.jar httpclient-4.5.13.jar httpcore-4.4.15.jar httpcore-nio-4.4.15.jar httpmime-4.5.13.jar ion-java-1.0.2.jar -j2objc-annotations-1.1.jar -jackson-annotations-2.13.0.jar -jackson-core-2.13.0.jar +j2objc-annotations-1.3.jar +jackson-annotations-2.13.4.jar +jackson-core-2.13.4.jar jackson-core-asl-1.9.13.jar -jackson-databind-2.13.0.jar +jackson-databind-2.13.4.jar jackson-dataformat-cbor-2.13.3.jar jackson-dataformat-yaml-2.13.3.jar jackson-datatype-jdk8-2.13.3.jar @@ -114,7 +113,7 @@ jakarta.validation-api-2.0.2.jar jakarta.websocket-api-1.1.2.jar jakarta.xml.bind-api-2.3.3.jar jamon-runtime-2.3.1.jar -janino-3.1.7.jar +janino-3.0.16.jar javassist-3.27.0-GA.jar javax.activation-api-1.2.0.jar javax.annotation-api-1.3.2.jar @@ -198,6 +197,7 @@ kubernetes-model-scheduling-5.10.2.jar kubernetes-model-storageclass-5.10.2.jar libfb303-0.9.3.jar libthrift-0.9.3.jar +listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar log4j-1.2-api-2.17.2.jar logback-classic-1.2.11.jar logback-core-1.2.11.jar @@ -231,7 +231,6 @@ okhttp-2.7.5.jar okhttp-3.14.9.jar okio-1.17.2.jar opencsv-2.3.jar -orc-core-1.3.3.jar oshi-core-6.1.1.jar paranamer-2.3.jar parquet-hadoop-bundle-1.8.1.jar @@ -256,8 +255,7 @@ simpleclient_tracer_common-0.15.0.jar simpleclient_tracer_otel-0.15.0.jar simpleclient_tracer_otel_agent-0.15.0.jar slf4j-api-1.7.36.jar -slf4j-reload4j-1.7.35.jar -snakeyaml-1.30.jar +snakeyaml-1.31.jar snappy-java-1.1.8.4.jar spring-aop-5.3.22.jar spring-beans-5.3.19.jar