Revert "BIGTOP-3165. Bump Spark to 2.4.0 (#482)"
This reverts commit 664240e57f064c7ec13c3685bc33891526c5944b.
diff --git a/bigtop-packages/src/common/spark/do-component-build b/bigtop-packages/src/common/spark/do-component-build
index 86af59a..c2a2322 100644
--- a/bigtop-packages/src/common/spark/do-component-build
+++ b/bigtop-packages/src/common/spark/do-component-build
@@ -18,11 +18,16 @@
. `dirname $0`/bigtop.bom
+# BIGTOP-2607
+sed -i -e /useZincServer/d -e /recompileMode/d pom.xml
+
BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${HOME} \
-Drepo.maven.org=$IVY_MIRROR_PROP \
-Dreactor.repo=file://${HOME}/.m2/repository \
-Dhadoop.version=$HADOOP_VERSION \
-Dyarn.version=$HADOOP_VERSION \
+ -Dprotobuf.version=2.5.0 \
+ -DrecompileMode=all \
-Pyarn -Phadoop-2.7 \
-Phive -Phive-thriftserver \
-Psparkr \
diff --git a/bigtop-packages/src/deb/spark/spark-core.install b/bigtop-packages/src/deb/spark/spark-core.install
index ddb9020..f3f2677 100644
--- a/bigtop-packages/src/deb/spark/spark-core.install
+++ b/bigtop-packages/src/deb/spark/spark-core.install
@@ -21,6 +21,7 @@
/usr/lib/spark/data
/usr/lib/spark/examples
/usr/lib/spark/jars
+/usr/lib/spark/licenses
/usr/lib/spark/sbin
/usr/lib/spark/work
/usr/share/doc/spark*
diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
index 44a3357..95fbc88 100644
--- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec
+++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
@@ -212,6 +212,7 @@
%{lib_spark}/examples
%{lib_spark}/jars
%exclude %{lib_spark}/jars/datanucleus-*.jar
+%{lib_spark}/licenses
%{lib_spark}/sbin
%{lib_spark}/work
%{etc_spark}
diff --git a/bigtop.bom b/bigtop.bom
index 0185af1..bdbc611 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -287,7 +287,7 @@
name = 'spark'
pkg = 'spark-core'
relNotes = 'Apache Spark'
- version { base = '2.4.0'; pkg = base; release = 1 }
+ version { base = '2.2.1'; pkg = base; release = 1 }
tarball { destination = "$name-${version.base}.tar.gz"
source = "$name-${version.base}.tgz" }
url { download_path = "/$name/$name-${version.base}"
