This is an automated email from the ASF dual-hosted git repository. wangzhen pushed a commit to branch dev-1.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 9f292c7c8bdc7b8dcc368c2ba5a301b190562f5c Merge: 5798cf58b 9e336ccbb Author: Zhen Wang <[email protected]> AuthorDate: Mon May 9 10:52:36 2022 +0800 Merge pull request #2093 from apache/master Merge master branch to dev-1.1.2 .asf.yaml | 4 +- .github/workflows/build.yml | 4 + linkis-commons/linkis-common/pom.xml | 14 +- ...inkisComputationGovernanceErrorCodeSummary.java | 7 +- .../common/errorcode/ErrorCodeUtilsTest.java | 33 +- .../LinkisCommonsErrorCodeSummaryTest.java | 103 +++++ ...sComputationGovernanceErrorCodeSummaryTest.java | 100 +++++ .../errorcode/LinkisErrorCodeSummaryTest.java | 91 ++++ .../errorcode/LinkisFrameErrorCodeSummaryTest.java | 84 ++++ .../common/exception/ErrorExceptionTest.java | 45 ++ .../common/exception/ExceptionLevelTest.java | 65 +++ .../common/exception/ExceptionManagerTest.java | 116 +++++ .../common/exception/FatalExceptionTest.java | 45 ++ .../exception/LinkisCommonErrorExceptionTest.java | 29 +- .../common/exception/LinkisExceptionTest.java | 124 ++++++ .../common/exception/LinkisRetryExceptionTest.java | 27 +- .../exception/LinkisRuntimeExceptionTest.java | 124 ++++++ .../linkis/common/exception/WarnExceptionTest.java | 45 ++ .../linkis/common/utils/ArrayUtilsTest.scala | 68 +++ .../linkis/common/utils/ClassUtilsTest.scala | 66 +++ .../linkis/common/utils/OverloadUtilsTest.scala | 57 +++ linkis-commons/linkis-hadoop-common/pom.xml | 203 +-------- .../governance/common/paser/CodeParser.scala | 14 +- .../common/paser/SQLCodeParserTest.scala | 30 +- .../cli/heartbeat/CliHeartbeatMonitor.scala | 82 ++-- .../entrance/conf/EntranceConfiguration.scala | 6 +- .../org/apache/linkis/entrance/log/LogReader.scala | 36 +- .../engineconn-plugins/flink/pom.xml | 31 -- .../engineconn-plugins/jdbc/pom.xml | 12 + .../engineconn-plugins/spark/pom.xml | 12 + .../spark/config/SparkConfiguration.scala | 2 +- .../spark/factory/SparkEngineConnFactory.scala | 14 +- .../operation/progress/ProgressProcessor.scala | 3 +- .../metadata/restful/api/DataSourceRestfulApi.java | 5 +- .../service/impl/DataSourceServiceImpl.java | 5 +- .../org/apache/linkis/metadata/util/HiveUtils.java | 6 +- .../service/ConfigurationService.scala | 205 ++++----- .../udf/service/impl/UDFTreeServiceImpl.java | 16 +- .../linkis-service-discovery/linkis-eureka/pom.xml | 41 -- .../linkis-spring-cloud-gateway/pom.xml | 10 + pom.xml | 487 ++++++++++++++++++++- tool/dependencies/known-dependencies.txt | 41 +- .../apps/URM/module/functionManagement/index.vue | 6 - web/src/apps/URM/module/header/index.vue | 11 - web/src/apps/URM/module/udfManagement/index.vue | 6 - web/src/apps/linkis/i18n/common/en.json | 4 +- web/src/apps/linkis/i18n/common/zh.json | 2 +- .../module/globalHistoryManagement/index.scss | 4 + .../module/globalHistoryManagement/index.vue | 10 +- web/src/apps/linkis/module/header/index.vue | 10 - web/src/apps/linkis/view/linkis/index.vue | 2 +- web/src/common/service/apiCommonMethod.js | 84 ---- web/src/common/service/mixin.js | 14 +- web/src/dss/module/header/index.vue | 14 +- web/src/dss/module/header/userMenu.vue | 8 +- web/src/dss/view/login/index.vue | 14 +- web/src/main.js | 3 - 57 files changed, 1963 insertions(+), 741 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
