diff --git a/Makefile b/Makefile index 85d3527412..f7ac26c097 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,9 @@ ifeq ($(YCSBSHA),.) endif TSTAMP:=.$(shell date +"%Y%m%d.%H%M%S") +HSE_YCSB_VER=$(shell cat hse/VERSION) +HSE_BINDING_VER=$(shell cut -d . -f 4- hse/VERSION) + .PHONY: all check-hse cleansrcs dist help srcs rpm all: rpm @@ -107,8 +110,9 @@ cleanbuilds: rm -rf $(TOPDIR)/{BUILD,RPMS,SRPMS} dist: check-hse + mvn versions:set-property -DnewVersion=$(HSE_BINDING_VER) -Dproperty=hse.version mvn install:install-file -Dfile=$(HSE_JAR) -DgroupId=test.org.hse\ - -DartifactId=hse -Dversion=0.1 -Dpackaging=jar + -DartifactId=hse -Dversion=$(HSE_BINDING_VER) -Dpackaging=jar mvn clean package help: @@ -126,6 +130,7 @@ rpm: dist srcs --define="_topdir $(TOPDIR)" \ --define="rel_candidate $(REL_CANDIDATE)" \ --define="buildno $(JENKINS_BUILDNO)" \ + --define="hseycsbversion $(HSE_YCSB_VER)" \ $(RPMSRCDIR)/hse-ycsb.spec srcs: cleansrcs diff --git a/hse-ycsb.spec b/hse-ycsb.spec index d1d2ed3021..170866980a 100644 --- a/hse-ycsb.spec +++ b/hse-ycsb.spec @@ -6,7 +6,7 @@ Summary: Yahoo! Cloud Serving Benchmark Name: hse-ycsb -Version: 0.17.0.1 +Version: %{hseycsbversion} %if %{rel_candidate} == "FALSE" Release: %{hseversion}.%{buildno}%{hsesha}%{ycsbsha}%{?dist} %else diff --git a/hse/VERSION b/hse/VERSION new file mode 100644 index 0000000000..8fce36f3d1 --- /dev/null +++ b/hse/VERSION @@ -0,0 +1 @@ +0.17.0.0.0 diff --git a/hse/pom.xml b/hse/pom.xml index 4178aad6a4..11c45b61c8 100644 --- a/hse/pom.xml +++ b/hse/pom.xml @@ -47,7 +47,7 @@ This code is derived from the ycsb project. test.org.hse hse - 0.1 + ${hse.version} diff --git a/pom.xml b/pom.xml index 37e58b64b4..0b2bdf55f1 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ This code is derived from the ycsb project. 4.8.0 9.1.1 - 0.1 + 0.0