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.

Sign up for GitHub

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

Preparing to release version 1.7.0. #5211

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Preparing to release version 1.7.0. #5211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
TAG: ${{ github.sha }}
SKIP_TEST: true
HUB: ghcr.io/apache/linkis
LINKIS_VERSION: 1.6.0
LINKIS_VERSION: 1.7.0
steps:
- name: Free up disk space
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
TAG: ${{ github.sha }}
SKIP_TEST: true
HUB: ghcr.io/apache/linkis
LINKIS_VERSION: 1.6.0
LINKIS_VERSION: 1.7.0
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions ...is-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ public class LabelCommonConfig {
CommonVars.apply("wds.linkis.label.entity.packages", "");

public static final CommonVars<String> SPARK_ENGINE_VERSION =
CommonVars.apply("wds.linkis.spark.engine.version", "2.4.3");
CommonVars.apply("wds.linkis.spark.engine.version", "3.2.1");

public static final CommonVars<String> HIVE_ENGINE_VERSION =
CommonVars.apply("wds.linkis.hive.engine.version", "2.3.3");
CommonVars.apply("wds.linkis.hive.engine.version", "3.1.3");

public static final CommonVars<String> PYTHON_ENGINE_VERSION =
CommonVars.apply("wds.linkis.python.engine.version", "python2");
Expand All @@ -64,7 +64,7 @@ public class LabelCommonConfig {
CommonVars.apply("wds.linkis.appconn.engine.version", "1");

public static final CommonVars<String> FLINK_ENGINE_VERSION =
CommonVars.apply("wds.linkis.flink.engine.version", "1.12.2");
CommonVars.apply("wds.linkis.flink.engine.version", "1.16.2");

public static final CommonVars<String> SQOOP_ENGINE_VERSION =
CommonVars.apply("wds.linkis.sqoop.engine.version", "1.4.6");
Expand Down
2 changes: 1 addition & 1 deletion linkis-dist/deploy-config/linkis-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export SERVER_HEAP_SIZE="512M"
##The extended lib such mysql-connector-java-*.jar
#LINKIS_EXTENDED_LIB=/appcom/common/linkisExtendedLib

LINKIS_VERSION=1.5.0
LINKIS_VERSION=1.7.0

# for install
LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
Expand Down
2 changes: 1 addition & 1 deletion linkis-dist/docker/ldh.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ARG SPARK_HADOOP_VERSION=3.2
ARG FLINK_VERSION=1.12.2
ARG ZOOKEEPER_VERSION=3.5.9

ARG LINKIS_VERSION=0.0.0
ARG LINKIS_VERSION=1.7.0

RUN useradd -r -s /bin/bash -u 100001 -g root -G wheel hadoop

Expand Down
4 changes: 2 additions & 2 deletions linkis-dist/docker/linkis.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ ENV TZ="Asia/Shanghai"
######################################################################
FROM linkis-base as linkis

ARG LINKIS_VERSION=0.0.0
ARG LINKIS_VERSION=1.7.0
ARG LINKIS_SYSTEM_USER="hadoop"
ARG LINKIS_SYSTEM_UID="9001"

Expand Down Expand Up @@ -106,7 +106,7 @@ ENTRYPOINT ["/bin/bash"]
######################################################################
FROM ${IMAGE_BASE_WEB} as linkis-web

ARG LINKIS_VERSION=0.0.0
ARG LINKIS_VERSION=1.7.0
ARG LINKIS_HOME=/opt/linkis

ENV LINKIS_WEB_ROOT ${LINKIS_HOME}-web
Expand Down
7 changes: 0 additions & 7 deletions ...cala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,6 @@ object JDBCMultiDatasourceParser extends Logging {
)
}

// check dbType
if (!DS_TYPES_TO_EXECUTE_TASK_BY_JDBC.contains(dbType)) {
throw new JDBCGetDatasourceInfoException(
UNSUPPORTED_DS_TYPE.getErrorCode,
MessageFormat.format(UNSUPPORTED_DS_TYPE.getErrorDesc, dbType)
)
}
if (CHANGE_DS_TYPE_TO_MYSQL) {
dbType = "mysql"
}
Expand Down
2 changes: 1 addition & 1 deletion ...spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ object SparkConfiguration extends Logging {
val LINKIS_SPARK_USEHIVECONTEXT = CommonVars[Boolean]("wds.linkis.spark.useHiveContext", true)

val DEFAULT_SPARK_JAR_NAME =
CommonVars[String]("wds.linkis.ecp.spark.default.jar", "linkis-engineconn-core-1.3.2.jar")
CommonVars[String]("wds.linkis.ecp.spark.default.jar", "linkis-engineconn-core-1.7.0.jar")

val ENGINE_JAR = CommonVars[String]("wds.linkis.enginemanager.core.jar", getMainJarName)

Expand Down
2 changes: 1 addition & 1 deletion linkis-web/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ VUE_APP_HOST=
BACKEND_URL=http://127.0.0.1:9001
VUE_APP_MN_CONFIG_PREFIX=
VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
VUE_APP_VERSION=1.6.0
VUE_APP_VERSION=1.7.0
2 changes: 1 addition & 1 deletion linkis-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linkis",
"version": "1.6.0",
"version": "1.7.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</snapshotRepository>
</distributionManagement>
<properties>
<revision>1.6.0</revision>
<revision>1.7.0</revision>

<zookeeper.version>3.9.2</zookeeper.version>
<curator.version>4.2.0</curator.version>
Expand Down
Loading