svn commit: r1435308 - in /incubator/hcatalog/branches/branch-0.5: CHANGES.txt build-support/scripts/release.sh build-support/scripts/test.sh

[tr...@apache.org]

Author: travis
Date: Fri Jan 18 19:22:07 2013
New Revision: 1435308

URL: http://svn.apache.org/viewvc?rev=1435308&view=rev
Log:
HCATALOG-598 fix setting hcatalog version number via the command-line

Added:
    incubator/hcatalog/branches/branch-0.5/build-support/scripts/release.sh
Modified:
    incubator/hcatalog/branches/branch-0.5/CHANGES.txt
    incubator/hcatalog/branches/branch-0.5/build-support/scripts/test.sh

Modified: incubator/hcatalog/branches/branch-0.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/CHANGES.txt?rev=1435308&r1=1435307&r2=1435308&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.5/CHANGES.txt Fri Jan 18 19:22:07 2013
@@ -162,6 +162,8 @@ Release 0.5.0 - Unreleased
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-598 fix setting hcatalog version number via the command-line (traviscrawford)
+
   HCAT-600 webhcat installation doc incorrectly gives location of start/stop script
 
   HCAT-593 webhcat system tests don't work as per the instructions (thejas via gates)

Added: incubator/hcatalog/branches/branch-0.5/build-support/scripts/release.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/build-support/scripts/release.sh?rev=1435308&view=auto
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/build-support/scripts/release.sh (added)
+++ incubator/hcatalog/branches/branch-0.5/build-support/scripts/release.sh Fri Jan 18 19:22:07 2013
@@ -0,0 +1,37 @@
+#!/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.
+
+# HCatalog uses maven for resolving dependencies and publishing artifacts.
+# Maven requires project version numbers be hard-coded in pom.xml files,
+# rather than being typical variables. Tooling in provided by maven to ease
+# managing these version numbers, however, as our build is ant-based
+# we cannot use that tooling. This release script is a workaround to
+# update pom.xml version numbers to properly build release artifacts.
+
+if [ "${HCAT_RELEASE_VERSION}" == "" ]; then
+  echo "Required environment variable HCAT_RELEASE_VERSION not set."
+  exit -1
+fi
+
+find . -name pom.xml -exec sed -i '' "s/0.5.0-SNAPSHOT/${HCAT_RELEASE_VERSION}/" {} \;
+
+export ANT_ARGS="${ANT_ARGS} -Dhcatalog.version=${HCAT_RELEASE_VERSION}"
+
+./build-support/scripts/test.sh
+

Modified: incubator/hcatalog/branches/branch-0.5/build-support/scripts/test.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/build-support/scripts/test.sh?rev=1435308&r1=1435307&r2=1435308&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.5/build-support/scripts/test.sh (original)
+++ incubator/hcatalog/branches/branch-0.5/build-support/scripts/test.sh Fri Jan 18 19:22:07 2013
@@ -45,12 +45,12 @@ cmd='ant clean src-release'
 run_cmd
 
 cd build
-tar -xzvf hcatalog-src-*.tar.gz
+tar -xzf hcatalog-src-*.tar.gz
 cd hcatalog-src-*
 echo "Running tests from $(pwd)"
 
 # Build with hadoop23, but do not run tests as they do not pass.
-cmd='ant -v clean package -Dmvn.hadoop.profile=hadoop23'
+cmd='ant clean package -Dmvn.hadoop.profile=hadoop23'
 run_cmd
 
 # Build and run tests with hadoop20. This must happen afterwards so test results