[bigtop] branch master updated: BIGTOP-3813: Incompatible guava & commons-lang3 Versions in Oozie Sharelib

[iwasakims]

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

iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 9b5834fc BIGTOP-3813: Incompatible guava & commons-lang3 Versions in 
Oozie Sharelib
9b5834fc is described below

commit 9b5834fced0d4c3469338965732a1f2b28dc9596
Author: William Horn <william.horn....@gmail.com>
AuthorDate: Wed Sep 28 11:27:21 2022 +0000

    BIGTOP-3813: Incompatible guava & commons-lang3 Versions in Oozie Sharelib
---
 bigtop-packages/src/common/oozie/do-component-build | 13 ++++++++++++-
 bigtop.bom                                          |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bigtop-packages/src/common/oozie/do-component-build 
b/bigtop-packages/src/common/oozie/do-component-build
index 9a2ca055..9e615c62 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -83,8 +83,19 @@ sed -i.bak "/http:\/\/repository.codehaus.org/a\\
             </releases>" ${WORKDIR}/pom.xml
 
 export MAVEN_OPTS="-Xmx2g"
+
 # Invoke Oozie build script
-${WORKDIR}/bin/mkdistro.sh -DjavaVersion=${JDK_VERSION} 
-DtargetJavaVersion=${JDK_VERSION} -DsourceJavaVersion=${JDK_VERSION} 
-DminJavaVersion=${JDK_VERSION} -DskipTests -Phadoop-3 -Pspark-2 -Puber 
-Dhadoop.version=${HADOOP_VERSION} -Dhadoop.auth.version=${HADOOP_VERSION} 
-Dhive.version=${HIVE_VERSION} -Dspark.version=${SPARK_VERSION} 
-Dspark.scala.binary.version=${SCALA_VERSION%.*} -Djackson.version=2.9.10 
${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
+MKDISTRO_ARGS=" -DjavaVersion=${JDK_VERSION} 
-DtargetJavaVersion=${JDK_VERSION} -DminJavaVersion=${JDK_VERSION} "
+MKDISTRO_ARGS+="-DskipTests -Phadoop-3 -Pspark-2 -Puber "
+MKDISTRO_ARGS+="-Dhadoop.version=${HADOOP_VERSION} "
+MKDISTRO_ARGS+="-Dhadoop.auth.version=${HADOOP_VERSION} "
+MKDISTRO_ARGS+="-Dhive.version=${HIVE_VERSION} "
+MKDISTRO_ARGS+="-Dspark.version=${SPARK_VERSION} "
+MKDISTRO_ARGS+="-Dspark.scala.binary.version=${SCALA_VERSION%.*} "
+MKDISTRO_ARGS+="-Dspark.guava.version=27.0-jre "
+MKDISTRO_ARGS+="-Dcommons.lang3.version=3.12.0 "
+MKDISTRO_ARGS+="-Djackson.version=2.9.10 "
+${WORKDIR}/bin/mkdistro.sh ${MKDISTRO_ARGS} ${EXTRA_GOALS} 
-Dmaven.repo.local=${HOME}/.m2/repository "$@"
 MKDISTRO_RESULT=$?
 if [ "${MKDISTRO_RESULT}" != "0" ]; then
   echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"
diff --git a/bigtop.bom b/bigtop.bom
index a069bcbf..eddd4a60 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -186,7 +186,7 @@ bigtop {
     'oozie' {
       name    = 'oozie'
       relNotes = 'Apache Oozie'
-      version { base = '5.2.1'; pkg = base; release = 1 }
+      version { base = '5.2.1'; pkg = base; release = 2 }
       tarball { destination = "$name-${version.base}.tar.gz"
                 source      = destination }
       url     { download_path = "/$name/${version.base}/"