Updated YCSB dependency and added my developer details to root pom
diff --git a/gora-benchmark/pom.xml b/gora-benchmark/pom.xml
index c931aa5..1128017 100644
--- a/gora-benchmark/pom.xml
+++ b/gora-benchmark/pom.xml
@@ -80,9 +80,9 @@
</plugins>
</build>
<dependencies>
-
+
<dependency>
- <groupId>com.yahoo.ycsb</groupId>
+ <groupId>site.ycsb</groupId>
<artifactId>core</artifactId>
</dependency>
diff --git a/gora-benchmark/src/main/java/org/apache/gora/benchmark/GoraBenchmarkClient.java b/gora-benchmark/src/main/java/org/apache/gora/benchmark/GoraBenchmarkClient.java
index fa37b06..79c5840 100644
--- a/gora-benchmark/src/main/java/org/apache/gora/benchmark/GoraBenchmarkClient.java
+++ b/gora-benchmark/src/main/java/org/apache/gora/benchmark/GoraBenchmarkClient.java
@@ -33,12 +33,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.yahoo.ycsb.ByteIterator;
-import com.yahoo.ycsb.DB;
-import com.yahoo.ycsb.DBException;
-import com.yahoo.ycsb.Status;
-import com.yahoo.ycsb.StringByteIterator;
-import com.yahoo.ycsb.workloads.CoreWorkload;
+import site.ycsb.ByteIterator;
+import site.ycsb.DB;
+import site.ycsb.DBException;
+import site.ycsb.Status;
+import site.ycsb.StringByteIterator;
+import site.ycsb.workloads.CoreWorkload;
+
import org.apache.gora.benchmark.generated.User;
/**
diff --git a/gora-benchmark/src/main/java/org/apache/gora/benchmark/GoraBenchmarkUtils.java b/gora-benchmark/src/main/java/org/apache/gora/benchmark/GoraBenchmarkUtils.java
index a2ac860..27c991d 100644
--- a/gora-benchmark/src/main/java/org/apache/gora/benchmark/GoraBenchmarkUtils.java
+++ b/gora-benchmark/src/main/java/org/apache/gora/benchmark/GoraBenchmarkUtils.java
@@ -54,7 +54,7 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import com.yahoo.ycsb.ByteIterator;
+import site.ycsb.ByteIterator;
/**
* The Class GoraBenchmarkUtils has some utilities that dynamically generate
diff --git a/gora-benchmark/src/test/java/org/apache/gora/benchmark/GoraClientTest.java b/gora-benchmark/src/test/java/org/apache/gora/benchmark/GoraClientTest.java
index 5bf6008..321d151 100644
--- a/gora-benchmark/src/test/java/org/apache/gora/benchmark/GoraClientTest.java
+++ b/gora-benchmark/src/test/java/org/apache/gora/benchmark/GoraClientTest.java
@@ -32,7 +32,6 @@
import org.apache.gora.benchmark.generated.User;
import org.apache.gora.store.DataStoreFactory;
import org.apache.gora.util.GoraException;
-import org.apache.hadoop.hbase.util.Bytes;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -40,11 +39,6 @@
import org.slf4j.LoggerFactory;
import com.mongodb.MongoClient;
-import com.yahoo.ycsb.ByteIterator;
-import com.yahoo.ycsb.NumericByteIterator;
-import com.yahoo.ycsb.Status;
-import com.yahoo.ycsb.StringByteIterator;
-import com.yahoo.ycsb.workloads.CoreWorkload;
import de.flapdoodle.embed.mongo.MongodExecutable;
import de.flapdoodle.embed.mongo.MongodProcess;
@@ -54,6 +48,10 @@
import de.flapdoodle.embed.mongo.config.Net;
import de.flapdoodle.embed.mongo.distribution.Version;
import de.flapdoodle.embed.process.runtime.Network;
+import site.ycsb.ByteIterator;
+import site.ycsb.Status;
+import site.ycsb.StringByteIterator;
+import site.ycsb.workloads.CoreWorkload;
/**
* The Class GoraClientTest.
diff --git a/pom.xml b/pom.xml
index ad71914..5cdc319 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,10 +288,17 @@
<role>PMC Member</role>
</roles>
</developer>
+<<<<<<< HEAD
+ <developer>
+ <id>sheriffo</id>
+ <name>Sheriffo Ceesay</name>
+ <email>sheriffo [at] apache [dot] org</email>
+=======
<developer>
<id>chanakadkb</id>
<name>Chanaka Balasooriya</name>
<email>chanakadkb [at] apache [dot] org</email>
+>>>>>>> upstream/master
<roles>
<role>Committer</role>
<role>PMC Member</role>
@@ -859,7 +866,7 @@
<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>
@@ -1764,9 +1771,9 @@
<!-- 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>
