Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
22 changes: 18 additions & 4 deletions dev/publish_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ 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"
NEXUS_STAGING="https://repository.apache.org/service/local/staging"
NEXUS_PROFILE="153446d1ac37c4"
Expand Down Expand Up @@ -92,13 +92,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} \
-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 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} -Pscala-2.11 \
${PUBLISH_PROFILES} ${PROJECT_OPTIONS}"
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
fi

Expand Down
Empty file modified kylin/pom.xml
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion pom.xml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
<exclude>.github/*</exclude>
<exclude>.gitignore</exclude>
<exclude>.repository/</exclude>
<exclude>.Rhistory</exclude>
<exclude>.Rhistory</exclude>
<exclude>**/*.diff</exclude>
<exclude>**/*.patch</exclude>
<exclude>**/*.avsc</exclude>
Expand Down