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
diff --git a/dev/publish_release.sh b/dev/publish_release.sh
index 63dc00b4fa7..fc355d52b62 100755
--- a/dev/publish_release.sh
+++ b/dev/publish_release.sh
@@ -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"
@@ -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
 
diff --git a/kylin/pom.xml b/kylin/pom.xml
old mode 100755
new mode 100644
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 @@
               <exclude>.github/*</exclude>
               <exclude>.gitignore</exclude>
               <exclude>.repository/</exclude>
-  	          <exclude>.Rhistory</exclude>
+              <exclude>.Rhistory</exclude>
               <exclude>**/*.diff</exclude>
               <exclude>**/*.patch</exclude>
               <exclude>**/*.avsc</exclude>