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
