Skip to content

Commit 1077921

Browse files
committed
[ZEPPELIN-1180] Update publish_release.sh to publish scala 210 and scala 211 artifacts
### What is this PR for? - Update publish_release.sh to publish scala 2.10 and scala 2.11 artifacts to maven repository. - Set build spark version to 2.0 This PR supposed to work once apache#1186 and apache#1195 is merged ### What type of PR is it? Improvement ### What is the Jira issue? [ZEPPELIN-1180](https://issues.apache.org/jira/browse/ZEPPELIN-1180) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Mina Lee <[email protected]> Closes apache#1209 from minahlee/ZEPPELIN-1180 and squashes the following commits: 40e5718 [Mina Lee] Use underscore as word separator in file name for consistency 0a91932 [Mina Lee] Include all module for scala 2.11 artifact build c1d6439 [Mina Lee] publish 2.11 artifact to maven a7918f0 [Mina Lee] Fix mod from 755 to 644 bca1af1 [Mina Lee] Fix indentation
1 parent 8546666 commit 1077921

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ before_install:
7676
- R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org', lib='~/R')"
7777
- export R_LIBS='~/R'
7878
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1600x1024x16"
79-
- ./dev/change-scala-version.sh $SCALA_VER
79+
- ./dev/change_scala_version.sh $SCALA_VER
8080

8181
install:
8282
- mvn $BUILD_FLAG $PROFILE -B
File renamed without changes.

dev/publish_release.sh

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ NC='\033[0m' # No Color
4444
RELEASE_VERSION="$1"
4545
GIT_TAG="$2"
4646

47-
PUBLISH_PROFILES="-Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr"
47+
PUBLISH_PROFILES="-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr"
4848
PROJECT_OPTIONS="-pl !zeppelin-distribution"
4949
NEXUS_STAGING="https://repository.apache.org/service/local/staging"
5050
NEXUS_PROFILE="153446d1ac37c4"
@@ -92,13 +92,27 @@ function publish_to_maven() {
9292

9393
tmp_repo="$(mktemp -d /tmp/zeppelin-repo-XXXXX)"
9494

95+
# build with scala-2.10
9596
echo "mvn clean install -Ppublish-distr \
96-
-Dmaven.repo.local=${tmp_repo} \
97+
-Dmaven.repo.local=${tmp_repo} -Pscala-2.10 \
9798
${PUBLISH_PROFILES} ${PROJECT_OPTIONS}"
98-
mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" \
99+
mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" -Pscala-2.10 \
99100
${PUBLISH_PROFILES} ${PROJECT_OPTIONS}
100101
if [[ $? -ne 0 ]]; then
101-
echo "Build failed."
102+
echo "Build with scala 2.10 failed."
103+
exit 1
104+
fi
105+
106+
# build with scala-2.11
107+
"${BASEDIR}/change_scala_version.sh" 2.11
108+
109+
echo "mvn clean install -Ppublish-distr \
110+
-Dmaven.repo.local=${tmp_repo} -Pscala-2.11 \
111+
${PUBLISH_PROFILES} ${PROJECT_OPTIONS}"
112+
mvn clean install -Ppublish-distr -Dmaven.repo.local="${tmp_repo}" -Pscala-2.11 \
113+
${PUBLISH_PROFILES} ${PROJECT_OPTIONS}
114+
if [[ $? -ne 0 ]]; then
115+
echo "Build with scala 2.11 failed."
102116
exit 1
103117
fi
104118

kylin/pom.xml

100755100644
File mode changed.

pom.xml

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425
<exclude>.github/*</exclude>
426426
<exclude>.gitignore</exclude>
427427
<exclude>.repository/</exclude>
428-
<exclude>.Rhistory</exclude>
428+
<exclude>.Rhistory</exclude>
429429
<exclude>**/*.diff</exclude>
430430
<exclude>**/*.patch</exclude>
431431
<exclude>**/*.avsc</exclude>

0 commit comments

Comments
 (0)