From hcatalog-commits-return-1192-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Wed Jan 23 21:16:09 2013 Return-Path: X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C878DEE2E for ; Wed, 23 Jan 2013 21:16:08 +0000 (UTC) Received: (qmail 42333 invoked by uid 500); 23 Jan 2013 21:16:08 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 42298 invoked by uid 500); 23 Jan 2013 21:16:08 -0000 Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hcatalog-dev@incubator.apache.org Delivered-To: mailing list hcatalog-commits@incubator.apache.org Received: (qmail 42287 invoked by uid 99); 23 Jan 2013 21:16:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2013 21:16:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2013 21:16:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0BF2B2388900; Wed, 23 Jan 2013 21:15:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1437737 - in /incubator/hcatalog/branches/branch-0.5: CHANGES.txt build-support/scripts/release.sh build.properties Date: Wed, 23 Jan 2013 21:15:47 -0000 To: hcatalog-commits@incubator.apache.org From: travis@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130123211548.0BF2B2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: travis Date: Wed Jan 23 21:15:47 2013 New Revision: 1437737 URL: http://svn.apache.org/viewvc?rev=1437737&view=rev Log: HCATALOG-605 HCatalog release script does not update version in build.properties Modified: incubator/hcatalog/branches/branch-0.5/CHANGES.txt incubator/hcatalog/branches/branch-0.5/build-support/scripts/release.sh incubator/hcatalog/branches/branch-0.5/build.properties Modified: incubator/hcatalog/branches/branch-0.5/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/CHANGES.txt?rev=1437737&r1=1437736&r2=1437737&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.5/CHANGES.txt (original) +++ incubator/hcatalog/branches/branch-0.5/CHANGES.txt Wed Jan 23 21:15:47 2013 @@ -164,6 +164,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/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=1437737&r1=1437736&r2=1437737&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.5/build-support/scripts/release.sh (original) +++ incubator/hcatalog/branches/branch-0.5/build-support/scripts/release.sh Wed Jan 23 21:15:47 2013 @@ -29,9 +29,13 @@ if [ "${HCAT_RELEASE_VERSION}" == "" ]; exit -1 fi -find . -name pom.xml -exec sed -i '' "s/0.5.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 + +# 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/branches/branch-0.5/build.properties URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/build.properties?rev=1437737&r1=1437736&r2=1437737&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.5/build.properties (original) +++ incubator/hcatalog/branches/branch-0.5/build.properties Wed Jan 23 21:15:47 2013 @@ -15,9 +15,7 @@ # specific language governing permissions and limitations # under the License. -_version=0.5.0 -_vtype=-SNAPSHOT -hcatalog.version=${_version}${_vtype} +hcatalog.version=0.5.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