[bigtop] branch branch-1.4 updated: BIGTOP-3330: avoid duplicate jars between oozie and oozie-client

[of...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

oflebbe pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-1.4 by this push:
     new 62c41ee  BIGTOP-3330: avoid duplicate jars between oozie and oozie-client
62c41ee is described below

commit 62c41ee24164c14b5c0f793707f7d527b39ebdfa
Author: Luca Toscano <lt...@wikimedia.org>
AuthorDate: Sun Mar 22 18:25:40 2020 +0100

    BIGTOP-3330: avoid duplicate jars between oozie and oozie-client
    
    Add a workaround to the install_oozie.sh script to avoid duplicate
    jars between oozie and oozie-client. This issue leads to override
    errors when installing the oozie package on Debian (oozie-client
    is among its dependencies).
    
    Credis to Olaf Flebbe for the solution.
---
 bigtop-packages/src/common/oozie/install_oozie.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh
index 7d81f8b..112784e 100755
--- a/bigtop-packages/src/common/oozie/install_oozie.sh
+++ b/bigtop-packages/src/common/oozie/install_oozie.sh
@@ -232,3 +232,8 @@ cp -R ${BUILD_DIR}/libtools ${SERVER_LIB_DIR}/
 # Provide a convenience symlink to be more consistent with tarball deployment
 ln -s ${DATA_DIR#${SERVER_PREFIX}} ${SERVER_LIB_DIR}/libext
 
+# Remove jars provided by 'oozie-client' from 'oozie' to avoid run-time issues
+# while installing the package.
+for oozie_client_jar_file in $(ls $CLIENT_LIB_DIR/lib); do
+  rm -f $SERVER_LIB_DIR/lib/$oozie_client_jar_file
+done
\ No newline at end of file