diff --git a/.travis.yml b/.travis.yml index d4adc0d64e5..625c275427c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,11 +35,11 @@ matrix: include: # Test all modules with scala 2.10 - jdk: "oraclejdk7" - env: SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples" BUILD_FLAG="package -Dscala-2.10 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.10" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" # Test all modules with scala 2.11 - jdk: "oraclejdk7" - env: SCALA_VER="2.11" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Dscala-2.11 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.11" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" # Test spark module for 1.5.2 - jdk: "oraclejdk7" diff --git a/dev/publish_release.sh b/dev/publish_release.sh index 63dc00b4fa7..24e78313bd5 100755 --- a/dev/publish_release.sh +++ b/dev/publish_release.sh @@ -96,7 +96,19 @@ function publish_to_maven() { -Dmaven.repo.local=${tmp_repo} \ ${PUBLISH_PROFILES} ${PROJECT_OPTIONS}" mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" \ - ${PUBLISH_PROFILES} ${PROJECT_OPTIONS} + ${PUBLISH_PROFILES} -Pscala-2.10 ${PROJECT_OPTIONS} + if [[ $? -ne 0 ]]; then + echo "Build failed." + exit 1 + fi + + ./dev/change-scala-version.sh 2.11 + + echo "mvn clean install -Ppublish-distr \ + -Dmaven.repo.local=${tmp_repo} \ + ${PUBLISH_PROFILES} ${PROJECT_OPTIONS}" + mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" \ + ${PUBLISH_PROFILES} -Pscala-2.11 ${PROJECT_OPTIONS} if [[ $? -ne 0 ]]; then echo "Build failed." exit 1