diff --git a/bump-up.command b/bump-up.command
index 2957f95..89feb3e 100755
--- a/bump-up.command
+++ b/bump-up.command
@@ -19,6 +19,36 @@
 # under the License.
 #
 
+MODULES=("metrics-common" "metadata-store-directory-common" "zookeeper-api" "helix-common" "helix-core" \
+"helix-admin-webapp" "helix-front" "helix-rest" "helix-lock" "helix-view-aggregator" "helix-agent")
+
+update_pom_version() {
+  pom=$1
+  echo "bump up $pom"
+  sed -i'' -e "s/${version}/${new_version}/g" $pom
+  if ! grep -C 1 "$new_version" $pom; then
+    echo "Failed to update new version $new_version in $pom"
+    exit 1
+  fi
+}
+
+update_ivy() {
+  module=$1
+  ivy_file="$module-$version.ivy"
+  new_ivy_file="$module-$new_version.ivy"
+  if [ -f $module/$ivy_file ]; then
+    echo "bump up $module/$ivy_file"
+    git mv "$module/$ivy_file" "$module/$new_ivy_file"
+    sed -i'' -e "s/${version}/${new_version}/g" "$module/$new_ivy_file"
+    if ! grep -C 1 "$new_version" "$module/$new_ivy_file"; then
+      echo "Failed to update new version $new_version in $module/$new_ivy_file"
+      exit 1
+    fi
+  else
+    echo "$module/$ivy_file not exist"
+  fi
+}
+
 echo There are $# arguments to $0: $*
 if [ "$#" -eq 2 ]; then
   version=$1
@@ -30,182 +60,20 @@
   submajor_version=`echo $version | cut -d'.' -f2`
 
   new_minor_version=`expr $minor_version + 1`
-#  new_version=`echo $version | sed -e "s/${minor_version}/${new_minor_version}/g"`
   new_version="$major_version.$submajor_version.$new_minor_version"
 fi
 echo "bump up: $version -> $new_version"
+update_pom_version "pom.xml"
 
-#: <<'END'
-echo "bump up pom.xml"
-sed -i "s/${version}/${new_version}/g" pom.xml
-# git diff pom.xml
-grep -C 1 "$new_version" pom.xml
-
-echo "bump up metrics-common/pom.xml"
-sed -i "s/${version}/${new_version}/g" metrics-common/pom.xml
-grep -C 1 "$new_version" metrics-common/pom.xml
-# git diff metrics-common/pom.xml
-
-ivy_file="metrics-common-"$version".ivy"
-new_ivy_file="metrics-common-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f metrics-common/$ivy_file ]; then
-  echo "bump up metrics-common/$ivy_file"
-  git mv "metrics-common/$ivy_file" "metrics-common/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "metrics-common/$new_ivy_file"
-  grep -C 1 "$new_version" "metrics-common/$new_ivy_file"
-else
-  echo "metrics-common/$ivy_file not exist"
-fi
-
-
-echo "bump up metadata-store-directory-common/pom.xml"
-sed -i "s/${version}/${new_version}/g" metadata-store-directory-common/pom.xml
-grep -C 1 "$new_version" metadata-store-directory-common/pom.xml
-# git diff metadata-store-directory-common/pom.xml
-
-ivy_file="metadata-store-directory-common-"$version".ivy"
-new_ivy_file="metadata-store-directory-common-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f metadata-store-directory-common/$ivy_file ]; then
-  echo "bump up metadata-store-directory-common/$ivy_file"
-  git mv "metadata-store-directory-common/$ivy_file" "metadata-store-directory-common/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "metadata-store-directory-common/$new_ivy_file"
-  grep -C 1 "$new_version" "metadata-store-directory-common/$new_ivy_file"
-else
-  echo "metadata-store-directory-common/$ivy_file not exist"
-fi
-
-
-echo "bump up zookeeper-api/pom.xml"
-sed -i "s/${version}/${new_version}/g" zookeeper-api/pom.xml
-grep -C 1 "$new_version" zookeeper-api/pom.xml
-# git diff zookeeper-api/pom.xml
-
-ivy_file="zookeeper-api-"$version".ivy"
-new_ivy_file="zookeeper-api-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f zookeeper-api/$ivy_file ]; then
-  echo "bump up zookeeper-api/$ivy_file"
-  git mv "zookeeper-api/$ivy_file" "zookeeper-api/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "zookeeper-api/$new_ivy_file"
-  grep -C 1 "$new_version" "zookeeper-api/$new_ivy_file"
-else
-  echo "zookeeper-api/$ivy_file not exist"
-fi
-
-echo "bump up helix-common/pom.xml"
-sed -i "s/${version}/${new_version}/g" helix-common/pom.xml
-grep -C 1 "$new_version" helix-common/pom.xml
-# git diff helix-common/pom.xml
-
-ivy_file="helix-common-"$version".ivy"
-new_ivy_file="helix-common-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f helix-common/$ivy_file ]; then
-  echo "bump up helix-common/$ivy_file"
-  git mv "helix-common/$ivy_file" "helix-common/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "helix-common/$new_ivy_file"
-  grep -C 1 "$new_version" "helix-common/$new_ivy_file"
-else
-  echo "helix-common/$ivy_file not exist"
-fi
-
-echo "bump up helix-core/pom.xml"
-sed -i "s/${version}/${new_version}/g" helix-core/pom.xml
-grep -C 1 "$new_version" helix-core/pom.xml
-# git diff helix-core/pom.xml
-
-ivy_file="helix-core-"$version".ivy"
-new_ivy_file="helix-core-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f helix-core/$ivy_file ]; then
-  echo "bump up helix-core/$ivy_file"
-  git mv "helix-core/$ivy_file" "helix-core/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "helix-core/$new_ivy_file"
-  grep -C 1 "$new_version" "helix-core/$new_ivy_file"
-else
-  echo "helix-core/$ivy_file not exist"
-fi
-
-echo "bump up helix-admin-webapp/pom.xml"
-sed -i "s/${version}/${new_version}/g" helix-admin-webapp/pom.xml
-grep -C 1 "$new_version" helix-admin-webapp/pom.xml
-# git diff helix-admin-webapp/pom.xml
-
-ivy_file="helix-admin-webapp-"$version".ivy"
-new_ivy_file="helix-admin-webapp-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f helix-admin-webapp/$ivy_file ]; then
-  echo "bump up helix-admin-webapp/$ivy_file"
-  git mv "helix-admin-webapp/$ivy_file" "helix-admin-webapp/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "helix-admin-webapp/$new_ivy_file"
-  grep -C 1 "$new_version" "helix-admin-webapp/$new_ivy_file"
-else
-  echo "helix-admin-webapp/$ivy_file not exist"
-fi
-
-echo "bump up helix-rest/pom.xml"
-sed -i "s/${version}/${new_version}/g" helix-rest/pom.xml
-grep -C 1 "$new_version" helix-rest/pom.xml
-# git diff helix-rest/pom.xml
-
-ivy_file="helix-rest-"$version".ivy"
-new_ivy_file="helix-rest-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f helix-rest/$ivy_file ]; then
-  echo "bump up helix-rest/$ivy_file"
-  git mv "helix-rest/$ivy_file" "helix-rest/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "helix-rest/$new_ivy_file"
-  grep -C 1 "$new_version" "helix-rest/$new_ivy_file"
-else
-  echo "helix-rest/$ivy_file not exist"
-fi
-
-echo "bump up helix-lock/pom.xml"
-sed -i "s/${version}/${new_version}/g" helix-lock/pom.xml
-grep -C 1 "$new_version" helix-lock/pom.xml
-# git diff helix-lock/pom.xml
-
-ivy_file="helix-lock-"$version".ivy"
-new_ivy_file="helix-lock-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f helix-lock/$ivy_file ]; then
-  echo "bump up helix-lock/$ivy_file"
-  git mv "helix-lock/$ivy_file" "helix-lock/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "helix-lock/$new_ivy_file"
-  grep -C 1 "$new_version" "helix-lock/$new_ivy_file"
-else
-  echo "helix-lock/$ivy_file not exist"
-fi
-
-echo "bump up helix-agent/pom.xml"
-sed -i "s/${version}/${new_version}/g" helix-agent/pom.xml
-grep -C 1 "$new_version" helix-agent/pom.xml
-# git diff helix-agent/pom.xml
-
-ivy_file="helix-agent-"$version".ivy"
-new_ivy_file="helix-agent-"$new_version".ivy"
-# echo "$ivy_file"
-if [ -f helix-agent/$ivy_file ]; then
-  echo "bump up helix-agent/$ivy_file"
-  git mv "helix-agent/$ivy_file" "helix-agent/$new_ivy_file"
-  sed -i "s/${version}/${new_version}/g" "helix-agent/$new_ivy_file"
-  grep -C 1 "$new_version" "helix-agent/$new_ivy_file"
-else
-  echo "helix-agent/$ivy_file not exist"
-fi
-
-
-for POM in helix-agent/pom.xml recipes/task-execution/pom.xml recipes/pom.xml recipes/distributed-lock-manager/pom.xml recipes/rsync-replicated-file-system/pom.xml recipes/rabbitmq-consumer-group/pom.xml recipes/service-discovery/pom.xml
-do
-  echo "bump up $POM"
-  sed -i "s/${version}/${new_version}/g" $POM
-  grep -C 1 "$new_version" $POM
+for module in "${MODULES[@]}"; do
+  update_pom_version "$module/pom.xml"
+  update_ivy $module
 done
 
-echo "bump up helix-front/pom.xml"
-sed -i "s/${version}/${new_version}/g" helix-front/pom.xml
-grep -C 1 "$new_version" helix-front/pom.xml
+for pom in recipes/task-execution/pom.xml recipes/pom.xml \
+           recipes/distributed-lock-manager/pom.xml recipes/rsync-replicated-file-system/pom.xml \
+           recipes/rabbitmq-consumer-group/pom.xml recipes/service-discovery/pom.xml; do
+  update_pom_version $pom
+done
 
 #END