From b5106699d6adb71e2f16b86b04fb5668dcd2a247 Mon Sep 17 00:00:00 2001
From: "Robert J. Moore" <Robert.J.Moore@allanbank.com>
Date: Sun, 8 Nov 2015 13:45:31 -0500
Subject: [PATCH] [couchbase] Upgrade the Couchbase driver to 1.4.10.

This removes the need for the private Couchbase repository since the
1.4.10 criver is available in Maven Central.
---
 couchbase/pom.xml | 15 ++++-----------
 pom.xml           |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/couchbase/pom.xml b/couchbase/pom.xml
index a7d231a7..d3d7cd31 100644
--- a/couchbase/pom.xml
+++ b/couchbase/pom.xml
@@ -15,8 +15,9 @@ implied. See the License for the specific language governing
 permissions and limitations under the License. See accompanying
 LICENSE file.
 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.yahoo.ycsb</groupId>
@@ -35,7 +36,7 @@ LICENSE file.
 
     <dependencies>
         <dependency>
-            <groupId>couchbase</groupId>
+            <groupId>com.couchbase.client</groupId>
             <artifactId>couchbase-client</artifactId>
             <version>${couchbase.version}</version>
         </dependency>
@@ -55,12 +56,4 @@ LICENSE file.
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
-
-    <repositories>
-        <repository>
-            <id>couchbase</id>
-            <name>Couchbase Maven Repository</name>
-            <url>http://files.couchbase.com/maven2/</url>
-        </repository>
-    </repositories>
 </project>
diff --git a/pom.xml b/pom.xml
index 190c30ba..acc35128 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@ LICENSE file.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <thrift.version>0.8.0</thrift.version>
     <hypertable.version>0.9.5.6</hypertable.version>
-    <couchbase.version>1.1.8</couchbase.version>
+    <couchbase.version>1.4.10</couchbase.version>
     <tarantool.version>1.6.5</tarantool.version>
     <aerospike.version>3.1.2</aerospike.version>
     <solr.version>5.4.0</solr.version>
-- 
GitLab