You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/04/12 07:30:40 UTC

[incubator-linkis] 01/01: Merge pull request #1955 from apache/master

This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git

commit 5798cf58b26735482af03a4da3d08aeaa814b18e
Merge: ab97eafa4 55bc73a7b
Author: peacewong <wp...@gmail.com>
AuthorDate: Tue Apr 12 15:30:34 2022 +0800

    Merge pull request #1955 from apache/master
    
    Merge master into dev-1.2.0

 .../assembly-combined/pom.xml                      |   2 +-
 .../public-module-combined/pom.xml                 |   2 +-
 .../deploy-config/linkis-env.sh                    |   2 +-
 assembly-combined-package/pom.xml                  |   2 +-
 db/linkis_dml.sql                                  |   2 +-
 db/upgrade/1.1.0_schema/mysql/linkis_dml.sql       |   1 +
 .../upgrade/1.1.1_schema/mysql/linkis_dml.sql      |  26 +-
 licenses-binary/LICENSE-aopalliance-repackaged.txt | 759 +++++++++++++++++++++
 licenses-binary/LICENSE-hk2-api.txt                | 759 +++++++++++++++++++++
 licenses-binary/LICENSE-hk2-locator.txt            | 759 +++++++++++++++++++++
 licenses-binary/LICENSE-hk2-utils.txt              | 759 +++++++++++++++++++++
 licenses-binary/LICENSE-jackson-datatype-guava.txt |   8 +
 licenses-binary/LICENSE-jackson-datatype-jdk8.txt  |   8 +
 licenses-binary/LICENSE-jackson-datatype-joda.txt  |   8 +
 .../LICENSE-jackson-datatype-jsr310.txt            |   8 +
 .../LICENSE-jackson-module-paranamer-names.txt     |   8 +
 licenses-binary/LICENSE-jersey-apache-client4.txt  | 759 +++++++++++++++++++++
 licenses-binary/LICENSE-jersey-core.txt            | 759 +++++++++++++++++++++
 licenses-binary/LICENSE-jersey-servlet.txt         | 759 +++++++++++++++++++++
 licenses-binary/LICENSE-osgi-resource-locator.txt  | 759 +++++++++++++++++++++
 linkis-commons/linkis-common/pom.xml               |   5 +-
 linkis-commons/linkis-hadoop-common/pom.xml        |   2 +-
 linkis-commons/linkis-httpclient/pom.xml           |   2 +-
 linkis-commons/linkis-module/pom.xml               |   9 +-
 linkis-commons/linkis-mybatis/pom.xml              |   2 +-
 linkis-commons/linkis-protocol/pom.xml             |   2 +-
 linkis-commons/linkis-rpc/pom.xml                  |   2 +-
 linkis-commons/linkis-scheduler/pom.xml            |   2 +-
 .../scheduler/conf/SchedulerConfiguration.scala    |   4 +-
 .../parallelqueue/ParallelConsumerManager.scala    |   8 +-
 linkis-commons/linkis-storage/pom.xml              |   2 +-
 linkis-commons/pom.xml                             |   2 +-
 .../linkis-cli/linkis-cli-application/pom.xml      |   2 +-
 .../linkis-cli/linkis-cli-common/pom.xml           |   2 +-
 .../linkis-cli/linkis-cli-core/pom.xml             |   2 +-
 .../linkis-client/linkis-cli/pom.xml               |   2 +-
 .../linkis-computation-client/pom.xml              |   2 +-
 .../linkis-computation-governance-common/pom.xml   |   2 +-
 .../governance/common/paser/CodeParser.scala       |  21 +-
 .../common/paser/SQLCodeParserTest.scala           |  56 ++
 .../linkis-engineconn-linux-launch/pom.xml         |   2 +-
 .../linkis-engineconn-manager-core/pom.xml         |   2 +-
 .../linkis-engineconn-manager-server/pom.xml       |   2 +-
 .../linkis-engineconn-manager/pom.xml              |   2 +-
 .../linkis-once-engineconn/pom.xml                 |   2 +-
 .../linkis-streaming-engineconn/pom.xml            |   2 +-
 .../linkis-computation-engineconn/pom.xml          |   2 +-
 .../linkis-engineconn-common/pom.xml               |   2 +-
 .../linkis-engineconn-core/pom.xml                 |   2 +-
 .../accessible-executor/pom.xml                    |   2 +-
 .../callback-service/pom.xml                       |   2 +-
 .../executor-core/pom.xml                          |   2 +-
 .../resource-executor/pom.xml                      |   2 +-
 .../linkis-engineconn/pom.xml                      |   2 +-
 .../linkis-entrance/pom.xml                        |   2 +-
 .../entrance/conf/EntranceConfiguration.scala      |   6 +-
 .../entrance/scheduler/EntranceGroupFactory.scala  |  48 +-
 .../linkis-jdbc-driver/pom.xml                     |   2 +-
 .../linkis-manager/label-common/pom.xml            |   2 +-
 .../linkis-manager/label-manager/pom.xml           |   2 +-
 .../linkis-application-manager/pom.xml             |   2 +-
 .../linkis/manager/am/conf/AMConfiguration.scala   |   2 +-
 .../linkis-manager-common/pom.xml                  |   2 +-
 .../linkis-manager-service-common/pom.xml          |   2 +-
 .../linkis-manager-persistence/pom.xml             |   2 +-
 .../linkis-manager/linkis-resource-manager/pom.xml |   2 +-
 .../service/impl/DefaultResourceManager.scala      |   1 +
 .../linkis-manager/pom.xml                         |   2 +-
 linkis-computation-governance/pom.xml              |   2 +-
 .../engineconn-plugins/flink/pom.xml               |   3 +-
 .../flink/FlinkEngineConnPlugin.scala              |  17 +-
 .../executor/FlinkSQLComputationExecutor.scala     |   2 +-
 .../engineconn-plugins/hive/pom.xml                |   2 +-
 .../engineconn-plugins/io_file/pom.xml             |   2 +-
 .../engineconn-plugins/jdbc/pom.xml                |   6 +-
 .../jdbc/executer/JDBCEngineConnExecutor.scala     |   2 +
 .../engineconn-plugins/openlookeng/pom.xml         |   4 +-
 .../openlookeng/OpenLooKengECPlugin.scala          |   0
 .../factory/OpenLooKengEngineConnFactory.scala     |   0
 .../engineconn-plugins/pipeline/pom.xml            |   2 +-
 .../engineconn-plugins/python/pom.xml              |   2 +-
 .../engineconn-plugins/shell/pom.xml               |   2 +-
 .../engineconn-plugins/spark/pom.xml               |   5 +-
 .../spark/config/SparkConfiguration.scala          |   2 +-
 .../linkis-engineconn-plugin-cache/pom.xml         |   2 +-
 .../linkis-engineconn-plugin-core/pom.xml          |   2 +-
 .../linkis-engineconn-plugin-loader/pom.xml        |   2 +-
 .../linkis-engineconn-plugin-server/pom.xml        |   2 +-
 linkis-engineconn-plugins/pom.xml                  |   2 +-
 linkis-extensions/linkis-io-file-client/pom.xml    |   2 +-
 linkis-extensions/pom.xml                          |   2 +-
 .../linkis-code-orchestrator/pom.xml               |   2 +-
 .../linkis-computation-orchestrator/pom.xml        |   2 +-
 .../linkis-orchestrator-core/pom.xml               |   2 +-
 .../plugin/linkis-orchestrator-ecm-plugin/pom.xml  |   2 +-
 linkis-orchestrator/pom.xml                        |   2 +-
 .../linkis-bml/linkis-bml-client/pom.xml           |   2 +-
 .../linkis-bml/linkis-bml-common/pom.xml           |   2 +-
 .../linkis-bml/linkis-bml-engine-hook/pom.xml      |   2 +-
 .../linkis-bml/linkis-bml-server/pom.xml           |   2 +-
 linkis-public-enhancements/linkis-bml/pom.xml      |   2 +-
 .../linkis-context-service/linkis-cs-cache/pom.xml |   2 +-
 .../linkis-cs-client/pom.xml                       |   2 +-
 .../linkis-cs-common/pom.xml                       |   2 +-
 .../linkis-cs-highavailable/pom.xml                |   2 +-
 .../linkis-cs-listener/pom.xml                     |   2 +-
 .../linkis-cs-persistence/pom.xml                  |   2 +-
 .../linkis-cs-search/pom.xml                       |   2 +-
 .../linkis-cs-server/pom.xml                       |   2 +-
 .../linkis-context-service/pom.xml                 |   2 +-
 .../linkis-datasource-client/pom.xml               |   2 +-
 .../linkis-datasource-manager/common/pom.xml       |   2 +-
 .../linkis-datasource-manager/server/pom.xml       |   2 +-
 .../linkis-metadata-manager/common/pom.xml         |   2 +-
 .../linkis-metadata-manager/server/pom.xml         |   2 +-
 .../service/elasticsearch/pom.xml                  |   2 +-
 .../linkis-metadata-manager/service/hive/pom.xml   |   2 +-
 .../linkis-metadata-manager/service/kafka/pom.xml  |   2 +-
 .../linkis-metadata-manager/service/mysql/pom.xml  |   2 +-
 .../linkis-datasource/linkis-metadata/pom.xml      |   2 +-
 .../linkis-datasource/pom.xml                      |   2 +-
 .../linkis-configuration/pom.xml                   |   2 +-
 .../linkis-error-code-client/pom.xml               |   2 +-
 .../linkis-error-code-common/pom.xml               |   2 +-
 .../linkis-error-code-server/pom.xml               |   2 +-
 .../linkis-publicservice/linkis-error-code/pom.xml |   2 +-
 .../linkis-instance-label-client/pom.xml           |   2 +-
 .../linkis-instance-label-server/pom.xml           |   2 +-
 .../linkis-publicservice/linkis-jobhistory/pom.xml |   2 +-
 .../linkis-ps-common-lock/pom.xml                  |   2 +-
 .../linkis-storage-script-dev-client/pom.xml       |   2 +-
 .../linkis-storage-script-dev-server/pom.xml       |   2 +-
 .../linkis-udf/linkis-udf-client/pom.xml           |   2 +-
 .../linkis-udf/linkis-udf-common/pom.xml           |   2 +-
 .../linkis-udf/linkis-udf-service/pom.xml          |   2 +-
 .../linkis-publicservice/linkis-variable/pom.xml   |   2 +-
 .../linkis-publicservice/pom.xml                   |   2 +-
 linkis-public-enhancements/pom.xml                 |   2 +-
 .../linkis-service-discovery/linkis-eureka/pom.xml |   3 +-
 .../linkis-gateway-authentication/pom.xml          |   2 +-
 .../linkis-gateway-core/pom.xml                    |   2 +-
 .../gateway/config/GatewayConfiguration.scala      |   3 +-
 .../linkis/gateway/security/GatewaySSOUtils.scala  |   7 +-
 .../linkis-gateway-httpclient-support/pom.xml      |   2 +-
 .../linkis-gateway-server-support/pom.xml          |   3 +-
 .../linkis-spring-cloud-gateway/pom.xml            |   2 +-
 .../linkis-gateway-datasource-ruler/pom.xml        |   2 +-
 .../linkis-service-gateway/pom.xml                 |   2 +-
 linkis-spring-cloud-services/pom.xml               |   2 +-
 pom.xml                                            |  63 +-
 tool/dependencies/known-dependencies.txt           |  66 +-
 web/.env                                           |   2 +-
 152 files changed, 6454 insertions(+), 253 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org