You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2015/03/02 20:06:33 UTC
bigtop git commit: BIGTOP-1716: Define SCALA_VERSION in bigtop.bom
Repository: bigtop
Updated Branches:
refs/heads/master e4288e08d -> 3dd00010e
BIGTOP-1716: Define SCALA_VERSION in bigtop.bom
Signed-off-by: Konstantin Boudnik <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3dd00010
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3dd00010
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3dd00010
Branch: refs/heads/master
Commit: 3dd00010e41a9c55b90453f503dd9578e27d5c39
Parents: e4288e0
Author: Youngwoo Kim <wa...@gmail.com>
Authored: Mon Mar 2 15:42:40 2015 +0900
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Mon Mar 2 11:06:23 2015 -0800
----------------------------------------------------------------------
bigtop-packages/src/common/kafka/do-component-build | 4 ++--
bigtop-packages/src/common/spark/do-component-build | 4 ++++
bigtop-packages/src/common/spark/install_spark.sh | 2 --
bigtop.mk | 4 ++++
4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3dd00010/bigtop-packages/src/common/kafka/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/kafka/do-component-build b/bigtop-packages/src/common/kafka/do-component-build
index ba5a577..03348b6 100644
--- a/bigtop-packages/src/common/kafka/do-component-build
+++ b/bigtop-packages/src/common/kafka/do-component-build
@@ -16,6 +16,8 @@
set -ex
+. `dirname ${0}`/bigtop.bom
+
if [ "x$SCALA_HOME" = "x" ]; then
echo "SCALA_HOME has to be set before the build can run"
exit 2
@@ -30,8 +32,6 @@ BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${
# http://maven.40175.n5.nabble.com/Not-finding-artifact-in-local-repo-td3727753.html
export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m -XX:PermSize=1024m -XX:MaxPermSize=1024m"
-SCALA_VERSION=2.10.0
-
./gradlew -PscalaVersion=${SCALA_VERSION} clean releaseTarGz -x signArchives
rm -rf build
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3dd00010/bigtop-packages/src/common/spark/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/spark/do-component-build b/bigtop-packages/src/common/spark/do-component-build
index deecbe2..f33e9ed 100644
--- a/bigtop-packages/src/common/spark/do-component-build
+++ b/bigtop-packages/src/common/spark/do-component-build
@@ -23,12 +23,16 @@ if [ "x$SCALA_HOME" = "x" ]; then
exit 2
fi
+SCALA_BINARY_VERSION=`echo $SCALA_VERSION | grep -oP "\d.\d{2}"`
+
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 \
+ -Dscala.version=$SCALA_VERSION \
+ -Dscala.binary.version=$SCALA_BINARY_VERSION \
-DskipTests -DrecompileMode=all"
## this might be an issue at times
# http://maven.40175.n5.nabble.com/Not-finding-artifact-in-local-repo-td3727753.html
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3dd00010/bigtop-packages/src/common/spark/install_spark.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/spark/install_spark.sh b/bigtop-packages/src/common/spark/install_spark.sh
index e28edd3..40489d1 100644
--- a/bigtop-packages/src/common/spark/install_spark.sh
+++ b/bigtop-packages/src/common/spark/install_spark.sh
@@ -173,8 +173,6 @@ EOF
done
cat >> $PREFIX/$CONF_DIR/spark-env.sh <<EOF
-export SPARK_SCALA_VERSION=2.10
-
### Let's run everything with JVM runtime, instead of Scala
export SPARK_LAUNCH_WITH_SCALA=0
export SPARK_LIBRARY_PATH=\${SPARK_HOME}/lib
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3dd00010/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 6b1ab0f..76a3a83 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -19,6 +19,10 @@ BIGTOP_VERSION=0.9.0
JDK_VERSION=1.7
JDK_BASE_VERSION=$(JDK_VERSION)
+# Scala Version
+SCALA_VERSION=2.10.3
+SCALA_BASE_VERSION=$(SCALA_VERSION)
+
# ZooKeeper
ZOOKEEPER_NAME=zookeeper
ZOOKEEPER_RELNOTES_NAME=Apache Zookeeper