From bca1af17011a9bcce6abe38a6fa25e764bb8c740 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Wed, 20 Jul 2016 23:56:57 +0900 Subject: [PATCH 1/5] Fix indentation --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 pom.xml diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 918f97ca002..c5c429bb6cb --- a/pom.xml +++ b/pom.xml @@ -425,7 +425,7 @@ .github/* .gitignore .repository/ - .Rhistory + .Rhistory **/*.diff **/*.patch **/*.avsc From a7918f0a34aa554e4a1b8c243312cade193d7765 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Wed, 20 Jul 2016 23:57:25 +0900 Subject: [PATCH 2/5] Fix mod from 755 to 644 --- kylin/pom.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 kylin/pom.xml diff --git a/kylin/pom.xml b/kylin/pom.xml old mode 100755 new mode 100644 From c1d64395f4d51e66f95f85300108ebc67466d7a7 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Fri, 22 Jul 2016 11:54:45 +0900 Subject: [PATCH 3/5] publish 2.11 artifact to maven --- dev/publish_release.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dev/publish_release.sh b/dev/publish_release.sh index 63dc00b4fa7..7e0baee82f5 100755 --- a/dev/publish_release.sh +++ b/dev/publish_release.sh @@ -44,8 +44,9 @@ NC='\033[0m' # No Color RELEASE_VERSION="$1" GIT_TAG="$2" -PUBLISH_PROFILES="-Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr" +PUBLISH_PROFILES="-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr" PROJECT_OPTIONS="-pl !zeppelin-distribution" +PROJECT_OPTIONS_SCALA211="-pl zeppelin-interpreter,cassandra,flink,ignite,spark,spark-dependencies,r,zeppelin-display" NEXUS_STAGING="https://repository.apache.org/service/local/staging" NEXUS_PROFILE="153446d1ac37c4" @@ -92,13 +93,27 @@ function publish_to_maven() { tmp_repo="$(mktemp -d /tmp/zeppelin-repo-XXXXX)" + # build with scala-2.10 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} ${PROJECT_OPTIONS} if [[ $? -ne 0 ]]; then - echo "Build failed." + echo "Build with scala 2.10 failed." + exit 1 + fi + + # build with scala-2.11 + "${BASEDIR}/change_scala_version.sh" 2.11 + + echo "mvn clean install -Ppublish-distr \ + -Dmaven.repo.local=${tmp_repo} -Dscala-2.11 \ + ${PUBLISH_PROFILES} ${PROJECT_OPTIONS}" + mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" -Dscala-2.11\ + ${PUBLISH_PROFILES} ${PROJECT_OPTIONS_SCALA211} + if [[ $? -ne 0 ]]; then + echo "Build with scala 2.11 failed." exit 1 fi From 0a91932ff55dd19d6cda79a4e6c3df5e0fe518eb Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Sat, 23 Jul 2016 12:42:47 +0900 Subject: [PATCH 4/5] Include all module for scala 2.11 artifact build --- dev/publish_release.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dev/publish_release.sh b/dev/publish_release.sh index 7e0baee82f5..fc355d52b62 100755 --- a/dev/publish_release.sh +++ b/dev/publish_release.sh @@ -46,7 +46,6 @@ GIT_TAG="$2" PUBLISH_PROFILES="-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr" PROJECT_OPTIONS="-pl !zeppelin-distribution" -PROJECT_OPTIONS_SCALA211="-pl zeppelin-interpreter,cassandra,flink,ignite,spark,spark-dependencies,r,zeppelin-display" NEXUS_STAGING="https://repository.apache.org/service/local/staging" NEXUS_PROFILE="153446d1ac37c4" @@ -95,9 +94,9 @@ function publish_to_maven() { # build with scala-2.10 echo "mvn clean install -Ppublish-distr \ - -Dmaven.repo.local=${tmp_repo} \ + -Dmaven.repo.local=${tmp_repo} -Pscala-2.10 \ ${PUBLISH_PROFILES} ${PROJECT_OPTIONS}" - mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" \ + mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" -Pscala-2.10 \ ${PUBLISH_PROFILES} ${PROJECT_OPTIONS} if [[ $? -ne 0 ]]; then echo "Build with scala 2.10 failed." @@ -108,10 +107,10 @@ function publish_to_maven() { "${BASEDIR}/change_scala_version.sh" 2.11 echo "mvn clean install -Ppublish-distr \ - -Dmaven.repo.local=${tmp_repo} -Dscala-2.11 \ + -Dmaven.repo.local=${tmp_repo} -Pscala-2.11 \ ${PUBLISH_PROFILES} ${PROJECT_OPTIONS}" - mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" -Dscala-2.11\ - ${PUBLISH_PROFILES} ${PROJECT_OPTIONS_SCALA211} + mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" -Pscala-2.11 \ + ${PUBLISH_PROFILES} ${PROJECT_OPTIONS} if [[ $? -ne 0 ]]; then echo "Build with scala 2.11 failed." exit 1 From 40e5718d1be44736e4afca4ddae7cb8c8495e78f Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Sat, 23 Jul 2016 14:09:04 +0900 Subject: [PATCH 5/5] Use underscore as word separator in file name for consistency --- .travis.yml | 2 +- dev/{change-scala-version.sh => change_scala_version.sh} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dev/{change-scala-version.sh => change_scala_version.sh} (100%) diff --git a/.travis.yml b/.travis.yml index d4adc0d64e5..0e51115c1ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ before_install: - R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org', lib='~/R')" - export R_LIBS='~/R' - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1600x1024x16" - - ./dev/change-scala-version.sh $SCALA_VER + - ./dev/change_scala_version.sh $SCALA_VER install: - mvn $BUILD_FLAG $PROFILE -B diff --git a/dev/change-scala-version.sh b/dev/change_scala_version.sh similarity index 100% rename from dev/change-scala-version.sh rename to dev/change_scala_version.sh