Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.4.0 to Master #4679

Merged
merged 166 commits into from
Jun 20, 2023
Merged

Conversation

peacewong
Copy link
Contributor

What is the purpose of the change

Merge 1.4.0 to Master

Related issues/PRs

[Discuss] Switch the development branch to Master

GuoPhilipse and others added 30 commits February 21, 2023 19:29
* support different hive version

* fix code style

* log exception
…g engine (apache#4278)

* EngineConn no longer imports the dependencies of the underlying engine
* Support spark3.3+  and spark2.2- compile

* fix unknown dependency

* improve code

* remove unused dependency

* remove unused dependency for hive sink

---------

Co-authored-by: gf13871 <[email protected]>
…eto1.4.0

# Conflicts:
#	README.md
#	README_CN.md
#	linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernanceCommonConf.scala
#	linkis-computation-governance/linkis-manager/linkis-label-common/src/test/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabelTest.java
#	linkis-dist/package/conf/linkis.properties
#	linkis-engineconn-plugins/flink/pom.xml
#	linkis-engineconn-plugins/hive/src/main/resources/linkis-engineconn.properties
#	linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/conf/HiveEngineConfiguration.scala
#	linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/datacalc/sink/HiveSink.scala
#	linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
#	pom.xml
#	tool/dependencies/known-dependencies.txt
…ache#4427)

* feat: support kubernetes deploy ment without KIND dependency

* feat: support kubernetes deploy ment without KIND dependency

* feat: support kubernetes deploy ment without KIND dependency

* feat: support kubernetes deploy ment without KIND dependency
…h log and resultSet in OSS(apache#4185) (apache#4424)

* linkis-storge support oss filesystem(apache#4185)
* Delete useless files(RPCHttpContextClientConfig.java)
…pendencies

feat:commons_fileupload Upgrade to 1.5
aiceflower and others added 25 commits June 7, 2023 20:09
* remove v prefix

* impala is not compiled by default
* fix: remove engine version pattern check apache#4610

* fix: remove engine version pattern check apache#4610
* Add TicketID to node and service_instance table

* Fixed ECM not cleaning up when starting EC exception

* move File to java dir

* Because the information needs to be pushed to createEngine, there is no need to stop here, because create will stop

* Fix build error

* Fix Integration Test

* Fix Integration Test

* code optimize
* Fix es ArrayIndexOutOfBoundsException bug
* fix jdbc connection cache

* Modify the nonnull judgment

* Update JDBCEngineConnExecutor.scala

add annotation
* Flink removes useless code
# Conflicts:
#	.github/workflows/publish-docker.yaml
#	README_CN.md
#	tool/dependencies/known-dependencies.txt
@peacewong peacewong changed the title Merge 1.4.0 to Master [WIP]Merge 1.4.0 to Master Jun 20, 2023
@peacewong peacewong changed the title [WIP]Merge 1.4.0 to Master Merge 1.4.0 to Master Jun 20, 2023
@peacewong peacewong merged commit 6324978 into apache:master Jun 20, 2023
11 checks passed
@peacewong peacewong deleted the dev-1.4.0-to-master branch June 26, 2023 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.