You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/06/29 12:30:48 UTC
[incubator-linkis] branch dev-1.1.3 updated: fix: bug#2307.Before removing dist and plugin /
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.3 by this push:
new a3221aced fix: bug#2307.Before removing dist and plugin /
new 1aecd0c4a Merge pull request #2354 from ruY9527/dev-1.1.3-builds
a3221aced is described below
commit a3221aced477f4f30f1cc42dc14a45b79e08bd1a
Author: dorothy_tang <11...@qq.com>
AuthorDate: Mon Jun 27 21:27:44 2022 +0800
fix: bug#2307.Before removing dist and plugin /
---
.../linkis-cli-application/src/main/assembly/distribution.xml | 4 ++--
.../engineconn-plugins/flink/src/main/assembly/distribution.xml | 4 ++--
.../engineconn-plugins/hive/src/main/assembly/distribution.xml | 4 ++--
.../engineconn-plugins/io_file/src/main/assembly/distribution.xml | 4 ++--
.../engineconn-plugins/jdbc/src/main/assembly/distribution.xml | 4 ++--
.../openlookeng/src/main/assembly/distribution.xml | 4 ++--
.../engineconn-plugins/pipeline/src/main/assembly/distribution.xml | 4 ++--
.../engineconn-plugins/python/src/main/assembly/distribution.xml | 6 +++---
.../engineconn-plugins/shell/src/main/assembly/distribution.xml | 6 +++---
.../engineconn-plugins/spark/src/main/assembly/distribution.xml | 4 ++--
.../engineconn-plugins/sqoop/src/main/assembly/distribution.xml | 4 ++--
11 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/assembly/distribution.xml b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/assembly/distribution.xml
index 1198579c7..bbc634bd2 100644
--- a/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/assembly/distribution.xml
+++ b/linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-application/src/main/assembly/distribution.xml
@@ -99,7 +99,7 @@
<directory>
${basedir}/src/main/resources/conf/
</directory>
- <outputDirectory>/conf</outputDirectory>
+ <outputDirectory>conf</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -111,7 +111,7 @@
<directory>
${basedir}/src/main/resources/bin/
</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<includes>
<include>**/*</include>
</includes>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/assembly/distribution.xml
index 907fe887a..35eba4025 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/assembly/distribution.xml
@@ -197,7 +197,7 @@
</includes>
<fileMode>0777</fileMode>
<directoryMode>0755</directoryMode>
- <outputDirectory>./dist/v${flink.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${flink.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -210,7 +210,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>./plugin/${flink.version}</outputDirectory>
+ <outputDirectory>plugin/${flink.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/assembly/distribution.xml
index 53bfc723d..f06614da2 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/assembly/distribution.xml
@@ -233,7 +233,7 @@
<include>*</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${hive.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${hive.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -246,7 +246,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${hive.version}</outputDirectory>
+ <outputDirectory>plugin/${hive.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
index af4d0d6b3..04adcab9d 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
@@ -50,7 +50,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${io_file.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${io_file.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -63,7 +63,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${io_file.version}</outputDirectory>
+ <outputDirectory>plugin/${io_file.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/assembly/distribution.xml
index 4ade08e82..573caf889 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/assembly/distribution.xml
@@ -50,7 +50,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${jdbc.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${jdbc.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -63,7 +63,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${jdbc.version}</outputDirectory>
+ <outputDirectory>plugin/${jdbc.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
index 8ebe84d05..60c9dfaab 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
@@ -50,7 +50,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${openlookeng.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${openlookeng.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -63,7 +63,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${openlookeng.version}</outputDirectory>
+ <outputDirectory>plugin/${openlookeng.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/assembly/distribution.xml
index 60ee25cd4..e48771a5b 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/assembly/distribution.xml
@@ -51,7 +51,7 @@
<include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${pipeline.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${pipeline.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -64,7 +64,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${pipeline.version}</outputDirectory>
+ <outputDirectory>plugin/${pipeline.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/assembly/distribution.xml
index a194a84fb..d2a030e57 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/assembly/distribution.xml
@@ -53,7 +53,7 @@
<exclude>python</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${python.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${python.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -63,7 +63,7 @@
<include>*</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${python.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${python.version}/conf</outputDirectory>
</fileSet>
<fileSet>
@@ -75,7 +75,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${python.version}</outputDirectory>
+ <outputDirectory>plugin/${python.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/assembly/distribution.xml
index 5498d4b01..40a7db106 100755
--- a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/assembly/distribution.xml
@@ -50,7 +50,7 @@
<include>*</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${shell.version}/bin</outputDirectory>
+ <outputDirectory>dist/v${shell.version}/bin</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -60,7 +60,7 @@
<include>*</include>
</includes>
<fileMode>0777</fileMode>
- <outputDirectory>/dist/v${shell.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${shell.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -73,7 +73,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${shell.version}</outputDirectory>
+ <outputDirectory>plugin/${shell.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/assembly/distribution.xml
index 28f65f643..824af8d72 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/assembly/distribution.xml
@@ -54,7 +54,7 @@
</excludes>
<fileMode>0777</fileMode>
<directoryMode>0755</directoryMode>
- <outputDirectory>/dist/v${spark.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${spark.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -67,7 +67,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${spark.version}</outputDirectory>
+ <outputDirectory>plugin/${spark.version}</outputDirectory>
</fileSet>
</fileSets>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/assembly/distribution.xml
index 78f54c4c0..52264659d 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/assembly/distribution.xml
@@ -301,7 +301,7 @@
</includes>
<fileMode>0777</fileMode>
<directoryMode>0755</directoryMode>
- <outputDirectory>/dist/v${sqoop.version}/conf</outputDirectory>
+ <outputDirectory>dist/v${sqoop.version}/conf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -314,7 +314,7 @@
<exclude>*doc.jar</exclude>
</excludes>
<fileMode>0777</fileMode>
- <outputDirectory>/plugin/${sqoop.version}</outputDirectory>
+ <outputDirectory>plugin/${sqoop.version}</outputDirectory>
</fileSet>
</fileSets>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org