From 9e932e5ea50a1477878fcee1ae7aa524c01f73a1 Mon Sep 17 00:00:00 2001
From: Michael Reiche <48999328+mikereiche@users.noreply.github.com>
Date: Fri, 5 May 2023 09:39:45 -0700
Subject: [PATCH] Bump Couchbase Java SDK to 3.4.6. (#1728)

Also add more time for findByIdWithLock case - it must be more than the
default timeout of 2.5 seconds.

Closes #1727.
---
 pom.xml                                                       | 4 ++--
 .../ReactiveCouchbaseTemplateKeyValueIntegrationTests.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 63ce51c9..72776985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
     </parent>
 
     <properties>
-        <couchbase>3.4.5</couchbase>
-        <couchbase.osgi>3.4.5</couchbase.osgi>
+        <couchbase>3.4.6</couchbase>
+        <couchbase.osgi>3.4.6</couchbase.osgi>
         <springdata.commons>3.1.0-SNAPSHOT</springdata.commons>
         <java-module-name>spring.data.couchbase</java-module-name>
         <hibernate.validator>7.0.1.Final</hibernate.validator>
diff --git a/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java
index e1aa3e34..4174e9fc 100644
--- a/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java
@@ -120,7 +120,7 @@ class ReactiveCouchbaseTemplateKeyValueIntegrationTests extends JavaIntegrationT
 
 			reactiveCouchbaseTemplate.upsertById(User.class).one(user).block();
 
-			User foundUser = reactiveCouchbaseTemplate.findById(User.class).withLock(Duration.ofSeconds(2))
+			User foundUser = reactiveCouchbaseTemplate.findById(User.class).withLock(Duration.ofSeconds(4))
 					.one(user.getId()).block();
 			user.setVersion(foundUser.getVersion());// version will have changed
 			assertEquals(user, foundUser);
@@ -130,7 +130,7 @@ class ReactiveCouchbaseTemplateKeyValueIntegrationTests extends JavaIntegrationT
 			);
 			assertTrue(exception.retryReasons().contains(RetryReason.KV_LOCKED), "should have been locked");
 		} finally {
-			sleepSecs(2);
+			sleepSecs(5);
 			reactiveCouchbaseTemplate.removeByQuery(User.class).withConsistency(REQUEST_PLUS).all().collectList().block();
 		}