From b8e3d4d1d586922de6caff0c95f94f00ddf764d0 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 15 Dec 2021 11:31:54 +0200
Subject: [PATCH 1/6] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6c61494..06faf94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
         <maven.test.source>8</maven.test.source>
         <maven.test.target>8</maven.test.target>
         <gson.version>2.8.8</gson.version>
-        <jedis.version>3.7.0</jedis.version>
+        <jedis.version>3.7.1</jedis.version>
         <commons.pool2.version>2.11.1</commons.pool2.version>
     </properties>
 

From 3eda155cf715bde95c0c781c0c7d93b17675e618 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 15 Dec 2021 11:33:46 +0200
Subject: [PATCH 2/6] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 06faf94..14beef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.test.source>8</maven.test.source>
         <maven.test.target>8</maven.test.target>
-        <gson.version>2.8.8</gson.version>
+        <gson.version>2.8.9</gson.version>
         <jedis.version>3.7.1</jedis.version>
         <commons.pool2.version>2.11.1</commons.pool2.version>
     </properties>

From 4858eea9c64f12e3c6d4a50fc6d648770be50fa6 Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Mon, 31 Jan 2022 03:33:58 +0600
Subject: [PATCH 3/6] Non-arrays get cleared too (#65)

* Non-arrays get cleared too

Co-authored-by: Guy Korland <gkorland@gmail.com>
---
 .../com/redislabs/modules/rejson/ClientTest.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/redislabs/modules/rejson/ClientTest.java b/src/test/java/com/redislabs/modules/rejson/ClientTest.java
index 6c1ee89..a5aca36 100644
--- a/src/test/java/com/redislabs/modules/rejson/ClientTest.java
+++ b/src/test/java/com/redislabs/modules/rejson/ClientTest.java
@@ -417,11 +417,15 @@ public void clearArray() {
 
         assertEquals(1L, client.clear("foobar", arrPath));
         assertEquals(Long.valueOf(0L), client.arrLen("foobar", arrPath));
-
-        // ignore non-array
+    }
+	
+    @Test
+    public void clearString() {
+        client.set("foobar", new FooBarObject(), Path.ROOT_PATH);
+	    
         Path strPath = Path.of("foo");
-        assertEquals(0L, client.clear("foobar", strPath));
-        assertEquals("bar", client.get("foobar", String.class, strPath));
+        assertEquals(1L, client.clear("foobar", strPath));
+        assertEquals("", client.get("foobar", String.class, strPath));
     }
 
     @Test

From 91c2f1dd65f513c648d664d07d8f338ffdaf95d0 Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Mon, 14 Mar 2022 19:18:34 +0600
Subject: [PATCH 4/6] Add deprecate notice to README.md (#71)

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 34252e0..f59e0a1 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,10 @@
 
 A Java Client Library for [RedisJSON](https://github.com/RedisJSON/RedisJSON)
 
+## Deprecation notice
+
+As of [Jedis 4.0.0](https://github.com/redis/jedis) this library is deprecated. Its features have been merged into Jedis. Please either install it from [maven](https://mvnrepository.com/artifact/redis.clients/jedis) or [the repo](https://github.com/redis/jedis).
+
 ## Overview 
 
 This client provides access to RedisJSON's Redis API, and provides back-and-forth serialization between Java's and its objects.

From c542f710a9b25ec61db1b73340fd7f696417daba Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Mon, 14 Mar 2022 15:19:39 +0200
Subject: [PATCH 5/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f59e0a1..2456ac5 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ A Java Client Library for [RedisJSON](https://github.com/RedisJSON/RedisJSON)
 
 ## Deprecation notice
 
-As of [Jedis 4.0.0](https://github.com/redis/jedis) this library is deprecated. Its features have been merged into Jedis. Please either install it from [maven](https://mvnrepository.com/artifact/redis.clients/jedis) or [the repo](https://github.com/redis/jedis).
+As of [Jedis 4.0.0](https://github.com/redis/jedis) this library is deprecated. It's features have been merged into Jedis. Please either install it from [maven](https://mvnrepository.com/artifact/redis.clients/jedis) or [the repo](https://github.com/redis/jedis).
 
 ## Overview 
 

From 4c8e0a0f651fa7378ba1dd24bfd3ea6aae715b1c Mon Sep 17 00:00:00 2001
From: M Sazzadul Hoque <7600764+sazzad16@users.noreply.github.com>
Date: Tue, 17 May 2022 11:27:02 +0600
Subject: [PATCH 6/6] Revert "Non-arrays get cleared too (#65)" (#72)

This reverts commit 4858eea9c64f12e3c6d4a50fc6d648770be50fa6.
---
 .../com/redislabs/modules/rejson/ClientTest.java     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/redislabs/modules/rejson/ClientTest.java b/src/test/java/com/redislabs/modules/rejson/ClientTest.java
index a5aca36..6c1ee89 100644
--- a/src/test/java/com/redislabs/modules/rejson/ClientTest.java
+++ b/src/test/java/com/redislabs/modules/rejson/ClientTest.java
@@ -417,15 +417,11 @@ public void clearArray() {
 
         assertEquals(1L, client.clear("foobar", arrPath));
         assertEquals(Long.valueOf(0L), client.arrLen("foobar", arrPath));
-    }
-	
-    @Test
-    public void clearString() {
-        client.set("foobar", new FooBarObject(), Path.ROOT_PATH);
-	    
+
+        // ignore non-array
         Path strPath = Path.of("foo");
-        assertEquals(1L, client.clear("foobar", strPath));
-        assertEquals("", client.get("foobar", String.class, strPath));
+        assertEquals(0L, client.clear("foobar", strPath));
+        assertEquals("bar", client.get("foobar", String.class, strPath));
     }
 
     @Test