svn commit: r1437721 - in /incubator/hcatalog/trunk: CHANGES.txt build-support/scripts/release.sh build.properties

[tr...@apache.org]

Author: travis
Date: Wed Jan 23 20:47:51 2013
New Revision: 1437721

URL: http://svn.apache.org/viewvc?rev=1437721&view=rev
Log:
HCATALOG-605 HCatalog release script does not update version in build.properties

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/build-support/scripts/release.sh
    incubator/hcatalog/trunk/build.properties

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1437721&r1=1437720&r2=1437721&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Jan 23 20:47:51 2013
@@ -178,6 +178,8 @@ Release 0.5.0 - Unreleased
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-605 HCatalog release script does not update version in build.properties (traviscrawford)
+
   HCAT-603 releaseaudit should run before generating artifacts (traviscrawford)
 
   HCAT-598 fix setting hcatalog version number via the command-line (traviscrawford)

Modified: incubator/hcatalog/trunk/build-support/scripts/release.sh
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build-support/scripts/release.sh?rev=1437721&r1=1437720&r2=1437721&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build-support/scripts/release.sh (original)
+++ incubator/hcatalog/trunk/build-support/scripts/release.sh Wed Jan 23 20:47:51 2013
@@ -29,9 +29,12 @@ if [ "${HCAT_RELEASE_VERSION}" == "" ]; 
   exit -1
 fi
 
-find . -name pom.xml -exec sed -i '' "s/0.6.0-SNAPSHOT/${HCAT_RELEASE_VERSION}/" {} \;
+snapshot_version=$(awk -F= '/hcatalog.version=/ { print $2 }' build.properties)
 
-export ANT_ARGS="${ANT_ARGS} -Dhcatalog.version=${HCAT_RELEASE_VERSION}"
+find . -name pom.xml -exec sed -i '' "s/${snapshot_version}/${HCAT_RELEASE_VERSION}/" {} \;
+sed -i '' "s/${snapshot_version}/${HCAT_RELEASE_VERSION}/" build.properties
 
-./build-support/scripts/test.sh
+# useful to pass in "-Dtestcase=Foo" to bypass tests when troubleshooting builds
+export ANT_ARGS="${ANT_ARGS}"
 
+./build-support/scripts/test.sh

Modified: incubator/hcatalog/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.properties?rev=1437721&r1=1437720&r2=1437721&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.properties (original)
+++ incubator/hcatalog/trunk/build.properties Wed Jan 23 20:47:51 2013
@@ -15,9 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-_version=0.6.0
-_vtype=-SNAPSHOT
-hcatalog.version=${_version}${_vtype}
+hcatalog.version=0.6.0-SNAPSHOT
 jar.name=${ant.project.name}-${hcatalog.version}.jar
 hcatalog.jar=${ant.project.name}-${hcatalog.version}.jar
 hcatalog.core.jar=${ant.project.name}-core-${hcatalog.version}.jar