Repository: bigtop Updated Branches: refs/heads/master 1afdffe91 -> 29e68a2ee
BIGTOP-2102. Upgrade YCSB to 0.4.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/29e68a2e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/29e68a2e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/29e68a2e Branch: refs/heads/master Commit: 29e68a2ee592d19364cb7a97a8ec8fc1d4db8224 Parents: 1afdffe Author: YoungWoo Kim <[email protected]> Authored: Wed Oct 28 19:46:08 2015 +0900 Committer: YoungWoo Kim <[email protected]> Committed: Tue Nov 10 20:09:15 2015 +0900 ---------------------------------------------------------------------- .../src/common/ycsb/do-component-build | 2 +- .../src/common/ycsb/patch0-0.1.4-hbase98.diff | 39 -------------------- bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec | 3 -- bigtop.bom | 2 +- 4 files changed, 2 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/29e68a2e/bigtop-packages/src/common/ycsb/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ycsb/do-component-build b/bigtop-packages/src/common/ycsb/do-component-build index f13545e..ab1b107 100644 --- a/bigtop-packages/src/common/ycsb/do-component-build +++ b/bigtop-packages/src/common/ycsb/do-component-build @@ -18,7 +18,7 @@ set -ex . `dirname $0`/bigtop.bom -mvn clean package -DskipTests -Dhbase.version=$HBASE_VERSION-hadoop2 "$@" +mvn clean package -DskipTests -Dhbase098.version=$HBASE_VERSION-hadoop2 "$@" rm -rf build/dist mkdir -p build/dist http://git-wip-us.apache.org/repos/asf/bigtop/blob/29e68a2e/bigtop-packages/src/common/ycsb/patch0-0.1.4-hbase98.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ycsb/patch0-0.1.4-hbase98.diff b/bigtop-packages/src/common/ycsb/patch0-0.1.4-hbase98.diff deleted file mode 100644 index bd73a53..0000000 --- a/bigtop-packages/src/common/ycsb/patch0-0.1.4-hbase98.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/hbase/pom.xml b/hbase/pom.xml -index 55d243c..bcfe015 100644 ---- a/hbase/pom.xml -+++ b/hbase/pom.xml -@@ -11,10 +11,20 @@ - <name>HBase DB Binding</name> - - <dependencies> -- <dependency> -+ <!-- <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>${hbase.version}</version> -+ </dependency> --> -+ <dependency> -+ <groupId>org.apache.hbase</groupId> -+ <artifactId>hbase-client</artifactId> -+ <version>${hbase.version}</version> -+ </dependency> -+ <dependency> -+ <groupId>org.apache.hbase</groupId> -+ <artifactId>hbase-common</artifactId> -+ <version>${hbase.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.ycsb</groupId> -diff --git a/pom.xml b/pom.xml -index bc181f5..f85055a 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -63,7 +63,7 @@ - <module>gemfire</module> - <module>infinispan</module> - <module>jdbc</module> -- <module>mapkeeper</module> -+ <!-- <module>mapkeeper</module> --> - <module>mongodb</module> - <!--module>nosqldb</module--> - <module>redis</module> http://git-wip-us.apache.org/repos/asf/bigtop/blob/29e68a2e/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec b/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec index 6c43437..b208c36 100644 --- a/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec +++ b/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec @@ -32,7 +32,6 @@ Source0: %{ycsb_name}-%{ycsb_base_version}.tar.gz Source1: do-component-build Source2: install_%{ycsb_name}.sh Source3: bigtop.bom -#BIGTOP_PATCH_FILES Requires: python %description @@ -44,8 +43,6 @@ performance of NoSQL database management systems. %prep %setup -n YCSB-%{ycsb_base_version} -#BIGTOP_PATCH_COMMANDS - %build bash $RPM_SOURCE_DIR/do-component-build http://git-wip-us.apache.org/repos/asf/bigtop/blob/29e68a2e/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 04290bc..7b08952 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -365,7 +365,7 @@ bigtop { 'ycsb' { name = 'ycsb' relNotes = 'Yahoo! Cloud Serving Benchmark' - version { base = '0.1.4'; pkg = base; release = 1 } + version { base = '0.4.0'; pkg = base; release = 1 } tarball { destination = "$name-${version.base}.tar.gz" source = "${version.base}.tar.gz" } url { site = "https://github.com/brianfrankcooper/YCSB/archive";
