This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 06ab22c9 BIGTOP-3813: Incompatible guava & commons-lang3 Versions in
Oozie Sharelib
06ab22c9 is described below
commit 06ab22c9658aaf1969f63ff14a4b4779ce0e957c
Author: William Horn <[email protected]>
AuthorDate: Thu Sep 22 17:24:07 2022 -0400
BIGTOP-3813: Incompatible guava & commons-lang3 Versions in Oozie Sharelib
---
bigtop-packages/src/common/oozie/do-component-build | 14 +++++++++++++-
bigtop.bom | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/bigtop-packages/src/common/oozie/do-component-build
b/bigtop-packages/src/common/oozie/do-component-build
index 7640a34f..dc955a72 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -83,8 +83,20 @@ 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} -Dsqoop.version=${SQOOP_VERSION}
-Dspark.version=${SPARK_VERSION}
-Dspark.scala.binary.version=${SCALA_VERSION%.*} -Djackson.version=2.9.10
${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/re [...]
+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+="-Dsqoop.version=${SQOOP_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.10 "
+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 585a2072..422fd9f8 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -196,7 +196,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}/"
