You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by sh...@apache.org on 2019/10/22 14:10:05 UTC
[gora] 02/02: Merge branch 'pr-197'
This is an automated email from the ASF dual-hosted git repository.
sheriffo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gora.git
commit 8de999397c487116606539557ca03f4e75043386
Merge: f2bab9c 784cf67
Author: sc306 <Sheriffo Ceesay>
AuthorDate: Tue Oct 22 15:09:13 2019 +0100
Merge branch 'pr-197'
gora-benchmark/pom.xml | 4 ++--
.../org/apache/gora/benchmark/GoraBenchmarkClient.java | 13 +++++++------
.../org/apache/gora/benchmark/GoraBenchmarkUtils.java | 2 +-
.../java/org/apache/gora/benchmark/GoraClientTest.java | 10 ++++------
pom.xml | 17 +++++++++++++----
5 files changed, 27 insertions(+), 19 deletions(-)
diff --cc pom.xml
index 0ad5bb7,da3b1aa..c501ce4
mode 100755,100644..100755
--- a/pom.xml
+++ b/pom.xml
@@@ -782,10 -791,9 +791,10 @@@
<module>gora-ignite</module>
<module>gora-kudu</module>
<module>gora-hive</module>
+ <module>gora-redis</module>
<module>gora-tutorial</module>
+ <module>gora-benchmark</module>
<module>sources-dist</module>
- <!-- <module>gora-benchmark</module> -->
</modules>
<properties>
@@@ -860,11 -866,11 +869,11 @@@
<!-- Testing Dependencies -->
<junit.version>4.10</junit.version>
<test.container.version>1.4.2</test.container.version>
-
+
<!-- gora-benchmark and version dependencies -->
- <ycsb.version>0.17.0-SNAPSHOT</ycsb.version>
+ <site.ycsb.version>0.17.0</site.ycsb.version>
<datafactory.version>0.8</datafactory.version>
-
+
<!-- Maven Plugin Dependencies -->
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
@@@ -1782,14 -1770,14 +1791,14 @@@
<artifactId>testcontainers</artifactId>
<version>${test.container.version}</version>
</dependency>
-
+
<!-- Gora Benchmark Dependencies -->
<dependency>
- <groupId>com.yahoo.ycsb</groupId>
+ <groupId>site.ycsb</groupId>
<artifactId>core</artifactId>
- <version>${ycsb.version}</version>
+ <version>${site.ycsb.version}</version>
</dependency>
-
+
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>