diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 6e4e5097a2..8a26905abe 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -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: | diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index d385cb70ac..d9199040d8 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -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 diff --git a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java index 3304b45100..2d180c496e 100644 --- a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java +++ b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java @@ -34,10 +34,10 @@ public class LabelCommonConfig { CommonVars.apply("wds.linkis.label.entity.packages", ""); public static final CommonVars 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 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 PYTHON_ENGINE_VERSION = CommonVars.apply("wds.linkis.python.engine.version", "python2"); @@ -64,7 +64,7 @@ public class LabelCommonConfig { CommonVars.apply("wds.linkis.appconn.engine.version", "1"); public static final CommonVars 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 SQOOP_ENGINE_VERSION = CommonVars.apply("wds.linkis.sqoop.engine.version", "1.4.6"); diff --git a/linkis-dist/deploy-config/linkis-env.sh b/linkis-dist/deploy-config/linkis-env.sh index 5578e25277..cbae216437 100644 --- a/linkis-dist/deploy-config/linkis-env.sh +++ b/linkis-dist/deploy-config/linkis-env.sh @@ -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 diff --git a/linkis-dist/docker/ldh.Dockerfile b/linkis-dist/docker/ldh.Dockerfile index 2d1960fbad..0e6e02d1e1 100644 --- a/linkis-dist/docker/ldh.Dockerfile +++ b/linkis-dist/docker/ldh.Dockerfile @@ -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 diff --git a/linkis-dist/docker/linkis.Dockerfile b/linkis-dist/docker/linkis.Dockerfile index 8851c2722b..21a8e192ac 100644 --- a/linkis-dist/docker/linkis.Dockerfile +++ b/linkis-dist/docker/linkis.Dockerfile @@ -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" @@ -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 diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala index 3abece76bd..8cb52640be 100644 --- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala +++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCMultiDatasourceParser.scala @@ -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" } diff --git a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala index 9aba046654..716e42ffc6 100644 --- a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala +++ b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala @@ -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) diff --git a/linkis-web/.env b/linkis-web/.env index f75d096611..ca995c5f50 100644 --- a/linkis-web/.env +++ b/linkis-web/.env @@ -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 diff --git a/linkis-web/package.json b/linkis-web/package.json index 5080d29ba0..09fad4c336 100644 --- a/linkis-web/package.json +++ b/linkis-web/package.json @@ -1,6 +1,6 @@ { "name": "linkis", - "version": "1.6.0", + "version": "1.7.0", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/pom.xml b/pom.xml index d500b6bac1..fc49750d29 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ - 1.6.0 + 1.7.0 3.9.2 4.2.0