apache · minahlee · Jun 10, 2016 · Jun 10, 2016 · Jun 10, 2016 · Jun 14, 2016
diff --git a/alluxio/pom.xml b/alluxio/pom.xml
@@ -132,15 +132,6 @@
 
  <build>
  <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
  <plugin>
  <artifactId>maven-enforcer-plugin</artifactId>
  <version>1.3.1</version>

diff --git a/angular/pom.xml b/angular/pom.xml
@@ -60,15 +60,6 @@
 
  <build>
  <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
  <plugin>
  <artifactId>maven-enforcer-plugin</artifactId>
  <version>1.3.1</version> 

diff --git a/cassandra/pom.xml b/cassandra/pom.xml
@@ -230,15 +230,6 @@
  </executions>
  </plugin>
 
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
  <plugin>
  <artifactId>maven-enforcer-plugin</artifactId>
  <version>1.3.1</version>

diff --git a/dev/common_release.sh b/dev/common_release.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# common fucntions
+
+if [[ -z "${TAR}" ]]; then
+ TAR="/usr/bin/tar"
+fi
+
+if [[ -z "${SHASUM}" ]]; then
+ SHASUM="/usr/bin/shasum"
+fi
+
+if [[ -z "${WORKING_DIR}" ]]; then
+ WORKING_DIR="/tmp/zeppelin-release"
+fi
+
+mkdir "${WORKING_DIR}"
+
+usage() {
+ echo "usage) $0 [Release version] [Branch or Tag]"
+ echo " ex. $0 0.6.0 v0.6.0"
+ exit 1
+}
+
+function git_clone() { 
+ echo "Clone the source"
+ # clone source
+ git clone https://git-wip-us.apache.org/repos/asf/zeppelin.git "${WORKING_DIR}/zeppelin"
+
+ if [[ $? -ne 0 ]]; then
+ echo "Can not clone source repository"
+ exit 1
+ fi
+
+ cd "${WORKING_DIR}/zeppelin"
+ git checkout "${GIT_TAG}"
+ echo "Checked out ${GIT_TAG}"
+
+ # remove unnecessary files
+ rm "${WORKING_DIR}/zeppelin/.gitignore"
+ rm -rf "${WORKING_DIR}/zeppelin/.git"
+ rm -rf "${WORKING_DIR}/zeppelin/.github"
+ rm -rf "${WORKING_DIR}/zeppelin/docs"
+}
diff --git a/dev/create_release.sh b/dev/create_release.sh
@@ -18,114 +18,93 @@
 #
 
 # The script helps making a release.
-# You need specify a release name and branch|tag name.
+# You need to specify release version and branch|tag name.
 #
-# Here's some helpful documents for the release
+# Here are some helpful documents for the release.
 # http://www.apache.org/dev/release.html
 # http://www.apache.org/dev/release-publishing
 # http://www.apache.org/dev/release-signing.html
-# http://www.apache.org/dev/publishing-maven-artifacts.html
-
-if [[ -z "${TAR}" ]]; then
- TAR=/usr/bin/tar
-fi
-
-if [[ -z "${SHASUM}" ]]; then
- SHASUM="/usr/bin/shasum -a 512"
-fi
-
-
-if [[ -z "${WORKING_DIR}" ]]; then
- WORKING_DIR=/tmp/zeppelin-release
-fi
-
-if [[ -z "${GPG_PASSPHRASE}" ]]; then
- echo "You need GPG_PASSPHRASE variable set"
- exit 1
-fi
 
+BASEDIR="$(dirname "$0")"
+. "${BASEDIR}/common_release.sh"
+echo "${BASEDIR}/common_release.sh"
 
 if [[ $# -ne 2 ]]; then
- echo "usage) $0 [Release name] [Branch or Tag]"
- echo " ex. $0 0.6.0 branch-0.6"
- exit 1
+ usage
 fi
 
-RELEASE_NAME="${1}"
-BRANCH="${2}"
-
-
-if [[ -d "${WORKING_DIR}" ]]; then
- echo "Dir ${WORKING_DIR} already exists"
- exit 1
-fi
-
-mkdir ${WORKING_DIR}
-
-echo "Cloning the source and packaging"
-# clone source
-git clone -b ${BRANCH} git@github.com:apache/zeppelin.git ${WORKING_DIR}/zeppelin
-if [[ $? -ne 0 ]]; then
- echo "Can not clone source repository"
- exit 1
+if [[ -z "${GPG_PASSPHRASE}" ]]; then
+ echo "You need GPG_PASSPHRASE variable set"
+ exit 1
 fi
 
-# remove unnecessary files
-rm ${WORKING_DIR}/zeppelin/.gitignore
-rm -rf ${WORKING_DIR}/zeppelin/.git
-
-
-
-# create source package
-cd ${WORKING_DIR}
-cp -r zeppelin zeppelin-${RELEASE_NAME}
-${TAR} cvzf zeppelin-${RELEASE_NAME}.tgz zeppelin-${RELEASE_NAME}
-
-echo "Signing the source package"
-cd ${WORKING_DIR}
-echo $GPG_PASSPHRASE | gpg --passphrase-fd 0 --armor --output zeppelin-${RELEASE_NAME}.tgz.asc --detach-sig ${WORKING_DIR}/zeppelin-${RELEASE_NAME}.tgz
-echo $GPG_PASSPHRASE | gpg --passphrase-fd 0 --print-md MD5 zeppelin-${RELEASE_NAME}.tgz > ${WORKING_DIR}/zeppelin-${RELEASE_NAME}.tgz.md5
-${SHASUM} zeppelin-${RELEASE_NAME}.tgz > ${WORKING_DIR}/zeppelin-${RELEASE_NAME}.tgz.sha512
-
+RELEASE_VERSION="$1"
+GIT_TAG="$2"
+
+function make_source_package() {
+ # create source package
+ cd ${WORKING_DIR}
+ cp -r "zeppelin" "zeppelin-${RELEASE_VERSION}"
+ ${TAR} cvzf "zeppelin-${RELEASE_VERSION}.tgz" "zeppelin-${RELEASE_VERSION}"
+
+ echo "Signing the source package"
+ cd "${WORKING_DIR}"
+ echo "${GPG_PASSPHRASE}" | gpg --passphrase-fd 0 --armor \
+ --output "zeppelin-${RELEASE_VERSION}.tgz.asc" \
+ --detach-sig "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}.tgz"
+ echo "${GPG_PASSPHRASE}" | gpg --passphrase-fd 0 \
+ --print-md MD5 "zeppelin-${RELEASE_VERSION}.tgz" > \
+ "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}.tgz.md5"
+ echo "${GPG_PASSPHRASE}" | gpg --passphrase-fd 0 \
+ --print-md SHA512 "zeppelin-${RELEASE_VERSION}.tgz" > \
+ "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}.tgz.sha512"
+}
 
 function make_binary_release() {
- BIN_RELEASE_NAME="${1}"
- BUILD_FLAGS="${2}"
-
- cp -r ${WORKING_DIR}/zeppelin ${WORKING_DIR}/zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}
- cd ${WORKING_DIR}/zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}
- echo "mvn clean package -Pbuild-distr -DskipTests ${BUILD_FLAGS}"
- mvn clean package -Pbuild-distr -DskipTests ${BUILD_FLAGS}
- if [[ $? -ne 0 ]]; then
- echo "Build failed. ${BUILD_FLAGS}"
- exit 1
- fi
-
- # re-create package with proper dir name with binary license
- cd zeppelin-distribution/target/zeppelin-*
- mv zeppelin-* zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}
- cat ../../src/bin_license/LICENSE >> zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}/LICENSE
- cat ../../src/bin_license/NOTICE >> zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}/NOTICE
- cp ../../src/bin_license/licenses/* zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}/licenses/
- ${TAR} cvzf zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}
-
- # sign bin package
- echo $GPG_PASSPHRASE | gpg --passphrase-fd 0 --armor --output zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz.asc --detach-sig zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz
- echo $GPG_PASSPHRASE | gpg --passphrase-fd 0 --print-md MD5 zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz > zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz.md5
- ${SHASUM} zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz > zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz.sha512
-
- mv zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz ${WORKING_DIR}/
- mv zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz.asc ${WORKING_DIR}/
- mv zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz.md5 ${WORKING_DIR}/
- mv zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz.sha512 ${WORKING_DIR}/
-
- # clean up build dir
- rm -rf ${WORKING_DIR}/zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}
+ BIN_RELEASE_NAME="$1"
+ BUILD_FLAGS="$2"
+
+ cp -r "${WORKING_DIR}/zeppelin" "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
+ cd "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
+ echo "mvn clean package -Pbuild-distr -DskipTests ${BUILD_FLAGS}"
+ mvn clean package -Pbuild-distr -DskipTests ${BUILD_FLAGS}
+ if [[ $? -ne 0 ]]; then
+ echo "Build failed. ${BUILD_FLAGS}"
+ exit 1
+ fi
+
+ # re-create package with proper dir name with binary license
+ cd zeppelin-distribution/target/zeppelin-*
+ mv zeppelin-* "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
+ cat ../../src/bin_license/LICENSE >> "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}/LICENSE"
+ cat ../../src/bin_license/NOTICE >> "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}/NOTICE"
+ cp ../../src/bin_license/licenses/* "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}/licenses/"
+ ${TAR} cvzf "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz" "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
+
+ # sign bin package
+ echo "${GPG_PASSPHRASE}" | gpg --passphrase-fd 0 --armor \
+ --output "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz.asc" \
+ --detach-sig "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz"
+ echo "${GPG_PASSPHRASE}" | gpg --passphrase-fd 0 --print-md MD5 \
+ "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz" > \
+ "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz.md5"
+ ${SHASUM} -a 512 "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz" > \
+ "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz.sha512"
+
+ mv "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz" "${WORKING_DIR}/"
+ mv "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz.asc" "${WORKING_DIR}/"
+ mv "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz.md5" "${WORKING_DIR}/"
+ mv "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz.sha512" "${WORKING_DIR}/"
+
+ # clean up build dir
+ rm -rf "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
 }
 
-make_binary_release all "-Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark"
+git_clone
+make_source_package
+make_binary_release all "-Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr"
 
 # remove non release files and dirs
-rm -rf ${WORKING_DIR}/zeppelin
-rm -rf ${WORKING_DIR}/zeppelin-${RELEASE_NAME}
+rm -rf "${WORKING_DIR}/zeppelin"
+rm -rf "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}"
 echo "Release files are created under ${WORKING_DIR}"