You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wayang.apache.org by be...@apache.org on 2022/07/08 12:29:37 UTC
[incubator-wayang] 01/01: [WAYANG-assembly] correction in the folder structure
This is an automated email from the ASF dual-hosted git repository.
bertty pushed a commit to branch assembly
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git
commit 1562a6b993148997fb4fd618b69cd0a1435d31b2
Author: Bertty Contreras-Rojas <be...@databloom.ai>
AuthorDate: Fri Jul 8 14:29:17 2022 +0200
[WAYANG-assembly] correction in the folder structure
Signed-off-by: bertty <be...@apache.org>
---
bin/wayang-submit | 5 +++--
wayang-assembly/src/main/assembly/assembly.xml | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/bin/wayang-submit b/bin/wayang-submit
index a0ef256e..9cb4d48b 100755
--- a/bin/wayang-submit
+++ b/bin/wayang-submit
@@ -79,11 +79,12 @@ if [ -d "${HADOOP_HOME}" ]; then
fi
-WAYANG_CODE="${WAYANG_HOME}/lib"
+WAYANG_CODE="${WAYANG_HOME}/jars"
+WAYANG_LIBS="${WAYANG_HOME}/libs"
WAYANG_CONF="${WAYANG_HOME}/conf"
# Bootstrap the classpath.
-WAYANG_CLASSPATH="${WAYANG_CONF}:${WAYANG_CODE}/*"
+WAYANG_CLASSPATH="${WAYANG_CONF}/*:${WAYANG_CODE}/*:${WAYANG_LIBS}/*"
WAYANG_CLASSPATH="${WAYANG_CLASSPATH}:${SPARK_JARS_DIR}/*:${HADOOP_JARS_DIR}"
diff --git a/wayang-assembly/src/main/assembly/assembly.xml b/wayang-assembly/src/main/assembly/assembly.xml
index 73b43d18..2be5978b 100644
--- a/wayang-assembly/src/main/assembly/assembly.xml
+++ b/wayang-assembly/src/main/assembly/assembly.xml
@@ -62,6 +62,7 @@
<dependencySets>
<dependencySet>
+ <outputDirectory>${wayang.name}/jars</outputDirectory>
<includes>
<include>org.apache.wayang:*:jar</include>
</includes>
@@ -70,11 +71,12 @@
</excludes>
</dependencySet>
<dependencySet>
- <outputDirectory>${wayang.name}/lib</outputDirectory>
+ <outputDirectory>${wayang.name}/libs</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<excludes>
+ <exclude>org.apache.wayang:*:jar</exclude>
<exclude>org.apache.hadoop:*:jar</exclude>
<exclude>org.apache.spark:*:jar</exclude>
<exclude>org.apache.flink:*:jar</exclude>