incubator-ratis git commit: RATIS-84. A few improvements on the release script.

[sz...@apache.org]

Repository: incubator-ratis
Updated Branches:
  refs/heads/master 88bb44735 -> 642a22c16


RATIS-84. A few improvements on the release script.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/642a22c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/642a22c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/642a22c1

Branch: refs/heads/master
Commit: 642a22c166851dd81e6f96449239e88af72e64a0
Parents: 88bb447
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Mon May 1 17:05:00 2017 -0700
Committer: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Committed: Mon May 1 17:05:00 2017 -0700

----------------------------------------------------------------------
 dev-support/make_rc.sh                   | 41 ++++++++++++++++-----------
 ratis-assembly/src/main/assembly/src.xml |  1 +
 2 files changed, 26 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/642a22c1/dev-support/make_rc.sh
----------------------------------------------------------------------
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 7ec02d7..a4247c5 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -33,13 +33,18 @@ mvn=mvn
 if [ "$MAVEN" != "" ]; then
   mvn="${MAVEN}"
 fi
-mvnopts="-Xmx3g"
+mvnopts="-Xmx1g"
 if [ "$MAVEN_OPTS" != "" ]; then
   mvnopts="${MAVEN_OPTS}"
 fi
 
+mvnGet() {
+  ${mvn} -q -Dexec.executable="echo" -Dexec.args="\${${1}}" --non-recursive \
+    org.codehaus.mojo:exec-maven-plugin:1.6.0:exec 2>/dev/null
+}
+
 # Check project name
-projectname=`${mvn} help:evaluate -Dexpression=project.name | grep -v '[INFO]'`
+projectname=$(mvnGet project.name)
 if [ "${projectname}" = "Apache Ratis" ]; then
   echo
   echo "Prepare release artifacts for $projectname"
@@ -53,32 +58,36 @@ fi
 
 # Set projectdir and archivedir
 projectdir=$(pwd)
-echo "Project dir ${projectdir}"
+echo "Project dir: ${projectdir}"
 archivedir="${projectdir}/../`basename ${projectdir}`.`date -u +"%Y%m%d-%H%M%S"`"
-echo "Archive dir ${archivedir}"
+echo "Archive dir: ${archivedir}"
 if [ -d "${archivedir}" ]; then
   echo "${archivedir} already exists"
   exit 1;
 fi
+
 # Set repodir
 repodir=${projectdir}/../`basename ${projectdir}`.repository
-echo "Repo dir ${repodir}"
+echo "Repo dir: ${repodir}"
 
-# clean shaded source
-MAVEN_OPTS="${mvnopts}" ${mvn} clean -Pclean-shade
-
-artifactid=`${mvn} help:evaluate -Dexpression=project.artifactId | grep -v '[INFO]'`
-assemblydir="$(pwd)/${artifactid}-assembly"
+mvnFun() {
+  set -x
+  MAVEN_OPTS="${mvnopts}" ${mvn} -Dmaven.repo.local=${repodir} $@
+  set +x
+}
 
-# generate tar.gz
-MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests assembly:single \
-  -Prelease \
-  -Dmaven.javadoc.skip=true \
-  -Dmaven.repo.local=${repodir}
+# clean shaded source
+mvnFun clean -Pclean-shade
 repodir=`cd ${repodir} > /dev/null; pwd`
 
+# generate source tar.gz
+mvnFun install -DskipTests assembly:single -Prelease -Dmaven.javadoc.skip=true
+
 mkdir "${archivedir}"
 archivedir=`cd ${archivedir} > /dev/null; pwd`
+
+artifactid=$(mvnGet project.artifactId)
+assemblydir="$(pwd)/${artifactid}-assembly"
 mv ${assemblydir}/target/${artifactid}-*.tar.gz "${archivedir}"
 
 echo
@@ -100,6 +109,6 @@ echo "  MAVEN_OPTS=\"${mvnopts}\" ${mvn} deploy -DskipTests -Papache-release -Pr
 echo
 echo "If all good tag the RC"
 echo
-echo "Finally, you may want to remove archivedir and repodir"
+echo "Finally, you may want to remove archive dir and repo dir"
 echo "  rm -rf ${archivedir}"
 echo "  rm -rf ${repodir}"

http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/642a22c1/ratis-assembly/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/ratis-assembly/src/main/assembly/src.xml b/ratis-assembly/src/main/assembly/src.xml
index e3830ed..9802242 100644
--- a/ratis-assembly/src/main/assembly/src.xml
+++ b/ratis-assembly/src/main/assembly/src.xml
@@ -40,6 +40,7 @@
             <excludes>
               <!-- For shaded modules, exclude generated sources -->
               <exclude>src/main/java/</exclude>
+              <exclude>dependency-reduced-pom.xml</exclude>
 
               <exclude>target/</exclude>
               <exclude>test/</exclude>