diff --git build-support/scripts/release.sh build-support/scripts/release.sh index fa4adb6..2e0ea1a 100755 --- build-support/scripts/release.sh +++ build-support/scripts/release.sh @@ -29,9 +29,12 @@ if [ "${HCAT_RELEASE_VERSION}" == "" ]; then 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 diff --git build.properties build.properties index 17ad413..992962b 100644 --- build.properties +++ build.properties @@ -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