This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 783cf5ad8 [ISSUE-4063]The material package removes the version prefix
'v' (#4064)
783cf5ad8 is described below
commit 783cf5ad8d62e071e5bfc0da861f5ad30b63b59b
Author: binbincheng <[email protected]>
AuthorDate: Thu Mar 9 20:52:14 2023 +0800
[ISSUE-4063]The material package removes the version prefix 'v' (#4064)
* remove version leading edge
* update DefaultEngineConnBmlResourceGenerator.scala
* recover
* add file path
---
.../linkis-engineconn-plugin-core-errorcode.md | 1 +
.../errorcode/EngineconnCoreErrorCodeSummary.java | 6 ++++--
.../loader/loaders/DefaultEngineConnPluginLoader.java | 2 ++
.../service/impl/EnginePluginAdminServiceImpl.java | 1 -
.../AbstractEngineConnBmlResourceGenerator.scala | 14 ++++----------
.../DefaultEngineConnBmlResourceGenerator.scala | 18 ++++++++++++++----
.../service/DefaultEngineConnResourceService.scala | 4 +++-
.../elasticsearch/src/main/assembly/distribution.xml | 4 ++--
.../flink/src/main/assembly/distribution.xml | 4 ++--
.../hive/src/main/assembly/distribution.xml | 4 ++--
.../io_file/src/main/assembly/distribution.xml | 4 ++--
.../jdbc/src/main/assembly/distribution.xml | 4 ++--
.../openlookeng/src/main/assembly/distribution.xml | 4 ++--
.../pipeline/src/main/assembly/distribution.xml | 4 ++--
.../presto/src/main/assembly/distribution.xml | 4 ++--
.../python/src/main/assembly/distribution.xml | 6 +++---
.../seatunnel/src/main/assembly/distribution.xml | 4 ++--
.../shell/src/main/assembly/distribution.xml | 6 +++---
.../spark/src/main/assembly/distribution.xml | 4 ++--
.../sqoop/src/main/assembly/distribution.xml | 4 ++--
.../trino/src/main/assembly/distribution.xml | 4 ++--
21 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/docs/errorcode/linkis-engineconn-plugin-core-errorcode.md
b/docs/errorcode/linkis-engineconn-plugin-core-errorcode.md
index 67a499956..a929d062d 100644
--- a/docs/errorcode/linkis-engineconn-plugin-core-errorcode.md
+++ b/docs/errorcode/linkis-engineconn-plugin-core-errorcode.md
@@ -16,6 +16,7 @@
|linkis-engineconn-plugin-core |20001|The dist of engineConnType:{0} is
irregular, both the version dir and non-version dir are
exist,(engineConnType:{0} 的 dist
目录不符合规范，版本目录和非版本目录都存在)|DIST_IRREGULAR_EXIST|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20001|System have no permission to delete old
engineConn
file:{0}(系统无权删除旧的engineConn文件:{0})|NO_PERMISSION_FILE|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20001|The `lib` and `conf` dir is necessary in
engineConnType:{0} dist(`lib` 和 `conf` 目录在 engineConnType:{0}
dist目录中必需存在)|LIB_CONF_DIR_NECESSARY|EngineconnCoreErrorCodeSummary|
+|linkis-engineconn-plugin-core |20001|Version name in engineConnType:{0}
cannot contain special character '-'(Version name in engineConnType: {0} cannot
contain special character
'-')|CONTAINS_SPECIAL_CHARCATERS|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20011| Not supported ExecutorFactory(不支持
ExecutorFactory)|NOT_SUPPORTED_EF|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |70101| DefaultEngineRunTypeLabel cannot be
null(DefaultEngineRunTypeLabel
不能为空)|DERTL_CANNOT_NULL|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |70102|Cannot get label key. labels
(无法获取标签key,标签):{0}|CANNOT_GET_LABEL_KEY|EngineconnCoreErrorCodeSummary|
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/java/org/apache/linkis/manager/engineplugin/errorcode/EngineconnCoreErrorCodeSummary.java
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/java/org/apache/linkis/manager/engineplugin/errorcode/EngineconnCoreErrorCodeSummary.java
index 2f9e54f80..1685f4b65 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/java/org/apache/linkis/manager/engineplugin/errorcode/EngineconnCoreErrorCodeSummary.java
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/java/org/apache/linkis/manager/engineplugin/errorcode/EngineconnCoreErrorCodeSummary.java
@@ -35,7 +35,7 @@ public enum EngineconnCoreErrorCodeSummary implements
LinkisErrorCode {
20001, "Cannot find the home path of engineconn dist(找不到 engineconn dist
的 home 路径)"),
DIST_IS_EMPTY(
20001,
- "The dist of EngineConn is empty,engineConnType is:{0}(EngineConn 的 dist
为空,engineConnType为：{})"),
+ "The dist of EngineConn is empty,engineConnType is:{0}(EngineConn 的 dist
为空,engineConnType为：{0})"),
ENGINE_VERSION_NOT_FOUND(
20001,
"Cannot find the path of engineConn with specified version: {0} and
engineConnType: {1}(找不到版本为：{0} engineConnType 为:{1}的engineConn路径"),
@@ -48,7 +48,9 @@ public enum EngineconnCoreErrorCodeSummary implements
LinkisErrorCode {
LIB_CONF_DIR_NECESSARY(
20001,
"The `lib` and `conf` dir is necessary in engineConnType:{0} dist(`lib`
和 `conf` 目录在 engineConnType:{0} dist目录中必需存在)"),
-
+ CONTAINS_SPECIAL_CHARCATERS(
+ 20002,
+ "Version name in engineConnType:{0} cannot contain special character
'-'(Version name in engineConnType: {0} cannot contain special character '-')"),
NOT_SUPPORTED_EF(20011, "Not supported ExecutorFactory(不支持
ExecutorFactory)"),
DERTL_CANNOT_NULL(
70101, "DefaultEngineRunTypeLabel cannot be
null(DefaultEngineRunTypeLabel 不能为空)"),
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/DefaultEngineConnPluginLoader.java
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/DefaultEngineConnPluginLoader.java
index 2649adfd6..0e54ed8c4 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/DefaultEngineConnPluginLoader.java
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/loader/loaders/DefaultEngineConnPluginLoader.java
@@ -61,6 +61,7 @@ public class DefaultEngineConnPluginLoader extends
CacheablesEngineConnPluginLoa
public DefaultEngineConnPluginLoader() throws ErrorException {
// Check store path (is necessary)
String storePath =
EngineConnPluginLoaderConf.ENGINE_PLUGIN_STORE_PATH().getValue();
+ LOG.info("DefaultEngineConnPluginLoader, storePath:" + storePath);
if (StringUtils.isBlank(storePath)) {
ExceptionHelper.dealErrorException(
70061,
@@ -100,6 +101,7 @@ public class DefaultEngineConnPluginLoader extends
CacheablesEngineConnPluginLoa
EngineConnPluginInfo enginePluginInfo) throws Exception {
// Build save path
String savePath = rootStorePath;
+ LOG.info("EngineConnPluginInstance, savePath:" + savePath);
EngineTypeLabel typeLabel = enginePluginInfo.typeLabel();
if (!savePath.endsWith(String.valueOf(IOUtils.DIR_SEPARATOR))) {
savePath += IOUtils.DIR_SEPARATOR;
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/service/impl/EnginePluginAdminServiceImpl.java
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/service/impl/EnginePluginAdminServiceImpl.java
index a5656d439..803151d53 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/service/impl/EnginePluginAdminServiceImpl.java
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/engineplugin/server/service/impl/EnginePluginAdminServiceImpl.java
@@ -84,7 +84,6 @@ public class EnginePluginAdminServiceImpl implements
EnginePluginAdminService {
engineConnBmlResourceDao.getAllEngineConnBmlResource(ecType,
version);
allEngineConnBmlResource.forEach(
engineConnBmlResource -> {
- // 等待bug修复后修改
//
bmlClient.deleteResource(username,engineConnBmlResource.getBmlResourceId());
engineConnBmlResourceDao.delete(engineConnBmlResource);
});
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
index d62f8996f..fce3508c3 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
@@ -22,6 +22,7 @@ import
org.apache.linkis.engineplugin.server.localize.EngineConnBmlResourceGener
import
org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginErrorException
import
org.apache.linkis.manager.engineplugin.errorcode.EngineconnCoreErrorCodeSummary._
import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel
+import org.apache.linkis.storage.io.IOClient.logger
import org.apache.commons.lang3.StringUtils
@@ -49,8 +50,8 @@ abstract class AbstractEngineConnBmlResourceGenerator extends
EngineConnBmlResou
val engineConnDistHome = Paths.get(getEngineConnsHome, engineConnType,
"dist").toFile.getPath
checkEngineConnDistHome(engineConnDistHome)
if (StringUtils.isBlank(version) || NO_VERSION_MARK == version) return
engineConnDistHome
- val formattedVersion = if (version.startsWith("v")) version else "v" +
version
- val engineConnPackageHome = Paths.get(engineConnDistHome,
formattedVersion).toFile.getPath
+ val engineConnPackageHome = Paths.get(engineConnDistHome,
version).toFile.getPath
+ logger.info("getEngineConnDistHome, engineConnPackageHome path:" +
engineConnPackageHome)
val engineConnPackageHomeFile = new File(engineConnPackageHome)
if (!engineConnPackageHomeFile.exists()) {
throw new EngineConnPluginErrorException(
@@ -85,15 +86,8 @@ abstract class AbstractEngineConnBmlResourceGenerator
extends EngineConnBmlResou
DIST_IS_EMPTY.getErrorCode,
MessageFormat.format(DIST_IS_EMPTY.getErrorDesc, engineConnType)
)
- } else if (!children.exists(_.getName.startsWith("v"))) {
- Array(engineConnDistHome)
- } else if (children.forall(_.getName.startsWith("v"))) {
- children.map(_.getPath)
} else {
- throw new EngineConnPluginErrorException(
- DIST_IRREGULAR_EXIST.getErrorCode,
- MessageFormat.format(DIST_IRREGULAR_EXIST.getErrorDesc, engineConnType)
- )
+ children.map(_.getPath)
}
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala
index e6ce86688..41c05249a 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/localize/DefaultEngineConnBmlResourceGenerator.scala
@@ -22,6 +22,8 @@ import
org.apache.linkis.engineplugin.server.localize.EngineConnBmlResourceGener
import
org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginErrorException
import
org.apache.linkis.manager.engineplugin.errorcode.EngineconnCoreErrorCodeSummary._
+import org.apache.commons.lang3.StringUtils
+
import java.io.{File, FileInputStream, InputStream}
import java.text.MessageFormat
@@ -31,10 +33,17 @@ class DefaultEngineConnBmlResourceGenerator
override def generate(engineConnType: String): Map[String,
Array[EngineConnLocalizeResource]] =
getEngineConnDistHomeList(engineConnType).map { path =>
- val distFile = new File(path)
- val key = if (distFile.getName.startsWith("v")) distFile.getName else
NO_VERSION_MARK
+ val versionFile = new File(path)
+ logger.info("generate, versionFile:" + path)
+ val key = versionFile.getName
+ if (key.contains("-")) {
+ throw new EngineConnPluginErrorException(
+ CONTAINS_SPECIAL_CHARCATERS.getErrorCode,
+ MessageFormat.format(CONTAINS_SPECIAL_CHARCATERS.getErrorDesc,
engineConnType)
+ )
+ }
Utils.tryCatch {
- key -> generateDir(path)
+ key -> generateDir(versionFile.getPath)
} { case t: Throwable =>
logger.error(s"Generate dir : $path error, msg : " + t.getMessage, t)
throw t
@@ -51,6 +60,7 @@ class DefaultEngineConnBmlResourceGenerator
private def generateDir(path: String): Array[EngineConnLocalizeResource] = {
val distFile = new File(path)
+ logger.info("generateDir, distFile:" + path)
val validFiles = distFile
.listFiles()
.filterNot(f =>
@@ -75,7 +85,7 @@ class DefaultEngineConnBmlResourceGenerator
)
}
ZipUtils.fileToZip(file.getPath, path, file.getName + ".zip")
- // 如果是文件夹，这里的最后更新时间，采用文件夹的最后更新时间，而不是ZIP的最后更新时间.
+ // If it is a folder, the last update time here is the last update
time of the folder, not the last update time of
ZIP.(如果是文件夹，这里的最后更新时间，采用文件夹的最后更新时间，而不是ZIP的最后更新时间.)
EngineConnLocalizeResourceImpl(
newFile.getPath,
newFile.getName,
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
index bd08a225a..3ddfdc7bb 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnResourceService.scala
@@ -201,6 +201,8 @@ class DefaultEngineConnResourceService extends
EngineConnResourceService with Lo
engineConnBmlResource.setFileName(localizeResource.fileName)
engineConnBmlResource.setFileSize(localizeResource.fileSize)
engineConnBmlResource.setLastModified(localizeResource.lastModified)
+ if (version.startsWith("v"))
engineConnBmlResource.setVersion(version.substring(1))
+ else engineConnBmlResource.setVersion(version)
engineConnBmlResource.setVersion(version)
engineConnBmlResourceDao.save(engineConnBmlResource)
} else {
@@ -240,7 +242,7 @@ class DefaultEngineConnResourceService extends
EngineConnResourceService with Lo
val engineConnType = engineConnBMLResourceRequest.getEngineConnType
val version = engineConnBMLResourceRequest.getVersion
val engineConnBmlResources = asScalaBufferConverter(
- engineConnBmlResourceDao.getAllEngineConnBmlResource(engineConnType, "v"
+ version)
+ engineConnBmlResourceDao.getAllEngineConnBmlResource(engineConnType,
version)
)
val confBmlResourceMap = engineConnBmlResources.asScala
.find(_.getFileName == LaunchConstants.ENGINE_CONN_CONF_DIR_NAME +
".zip")
diff --git
a/linkis-engineconn-plugins/elasticsearch/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/elasticsearch/src/main/assembly/distribution.xml
index d5360d46c..9511b709a 100644
--- a/linkis-engineconn-plugins/elasticsearch/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/elasticsearch/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
-
<outputDirectory>/dist/v${elasticsearch.version}/lib</outputDirectory>
+
<outputDirectory>/dist/${elasticsearch.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -49,7 +49,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
-
<outputDirectory>dist/v${elasticsearch.version}/conf</outputDirectory>
+
<outputDirectory>dist/${elasticsearch.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git a/linkis-engineconn-plugins/flink/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/flink/src/main/assembly/distribution.xml
index 222f964c5..1e90d0f3b 100644
--- a/linkis-engineconn-plugins/flink/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/flink/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${flink.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${flink.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -195,7 +195,7 @@
</includes>
<fileMode>0777</fileMode>
<directoryMode>0755</directoryMode>
- <outputDirectory>dist/v${flink.version}/conf</outputDirectory>
+ <outputDirectory>dist/${flink.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git a/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml
index c9e84398e..bfce3eaa1 100644
--- a/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${hive.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${hive.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -231,7 +231,7 @@
<include>*</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${hive.version}/conf</outputDirectory>
+ <outputDirectory>dist/${hive.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git
a/linkis-engineconn-plugins/io_file/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/io_file/src/main/assembly/distribution.xml
index 00ee58ad3..7bda0d71f 100644
--- a/linkis-engineconn-plugins/io_file/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/io_file/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${io_file.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${io_file.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -48,7 +48,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${io_file.version}/conf</outputDirectory>
+ <outputDirectory>dist/${io_file.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git a/linkis-engineconn-plugins/jdbc/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/jdbc/src/main/assembly/distribution.xml
index 2083703a3..47f1f7e22 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/jdbc/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${jdbc.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${jdbc.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -48,7 +48,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${jdbc.version}/conf</outputDirectory>
+ <outputDirectory>dist/${jdbc.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git
a/linkis-engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
index b0219d07d..ba67212cf 100644
--- a/linkis-engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
-
<outputDirectory>/dist/v${openlookeng.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${openlookeng.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -48,7 +48,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
-
<outputDirectory>dist/v${openlookeng.version}/conf</outputDirectory>
+ <outputDirectory>dist/${openlookeng.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git
a/linkis-engineconn-plugins/pipeline/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/pipeline/src/main/assembly/distribution.xml
index 85a477c94..7ccaf4d1f 100644
--- a/linkis-engineconn-plugins/pipeline/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/pipeline/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${pipeline.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${pipeline.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -49,7 +49,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${pipeline.version}/conf</outputDirectory>
+ <outputDirectory>dist/${pipeline.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git
a/linkis-engineconn-plugins/presto/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/presto/src/main/assembly/distribution.xml
index a1b49206a..e8bbe485f 100644
--- a/linkis-engineconn-plugins/presto/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/presto/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${presto.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${presto.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -49,7 +49,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${presto.version}/conf</outputDirectory>
+ <outputDirectory>dist/${presto.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git
a/linkis-engineconn-plugins/python/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/python/src/main/assembly/distribution.xml
index 83438871a..1672a370c 100644
--- a/linkis-engineconn-plugins/python/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/python/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${python.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${python.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -51,7 +51,7 @@
<exclude>python</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${python.version}/conf</outputDirectory>
+ <outputDirectory>dist/${python.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -61,7 +61,7 @@
<include>*</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${python.version}/conf</outputDirectory>
+ <outputDirectory>dist/${python.version}/conf</outputDirectory>
</fileSet>
<fileSet>
diff --git
a/linkis-engineconn-plugins/seatunnel/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/seatunnel/src/main/assembly/distribution.xml
index fb76ed537..5ac1082b6 100644
--- a/linkis-engineconn-plugins/seatunnel/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/seatunnel/src/main/assembly/distribution.xml
@@ -31,7 +31,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${seatunnel.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${seatunnel.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -47,7 +47,7 @@
</includes>
<fileMode>0777</fileMode>
<directoryMode>0755</directoryMode>
- <outputDirectory>/dist/v${seatunnel.version}/conf</outputDirectory>
+ <outputDirectory>/dist/${seatunnel.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
diff --git a/linkis-engineconn-plugins/shell/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/shell/src/main/assembly/distribution.xml
index 51478862b..9105f2a71 100755
--- a/linkis-engineconn-plugins/shell/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/shell/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${shell.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${shell.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -48,7 +48,7 @@
<include>*</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${shell.version}/bin</outputDirectory>
+ <outputDirectory>dist/${shell.version}/bin</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -58,7 +58,7 @@
<include>*</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>dist/v${shell.version}/conf</outputDirectory>
+ <outputDirectory>dist/${shell.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git a/linkis-engineconn-plugins/spark/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/spark/src/main/assembly/distribution.xml
index b1de6a751..141e6b055 100644
--- a/linkis-engineconn-plugins/spark/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/spark/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${spark.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${spark.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -52,7 +52,7 @@
</excludes>
<fileMode>0777</fileMode>
<directoryMode>0755</directoryMode>
- <outputDirectory>dist/v${spark.version}/conf</outputDirectory>
+ <outputDirectory>dist/${spark.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git a/linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml
index 3c711f4a4..5c47d5913 100644
--- a/linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${sqoop.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${sqoop.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -299,7 +299,7 @@
</includes>
<fileMode>0777</fileMode>
<directoryMode>0755</directoryMode>
- <outputDirectory>dist/v${sqoop.version}/conf</outputDirectory>
+ <outputDirectory>dist/${sqoop.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
diff --git a/linkis-engineconn-plugins/trino/src/main/assembly/distribution.xml
b/linkis-engineconn-plugins/trino/src/main/assembly/distribution.xml
index 3fa53ccb1..e7b81f933 100644
--- a/linkis-engineconn-plugins/trino/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/trino/src/main/assembly/distribution.xml
@@ -30,7 +30,7 @@
<dependencySet>
<!-- Enable access to all projects in the current multimodule
build! <useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
- <outputDirectory>/dist/v${trino.version}/lib</outputDirectory>
+ <outputDirectory>/dist/${trino.version}/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
@@ -48,7 +48,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${trino.version}/conf</outputDirectory>
+ <outputDirectory>/dist/${trino.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
