Merge branch 'master' into master

.github/workflows/integration.yml

@@ -10,15 +10,16 @@ on:
       - '**/*.rst'
     branches:
       - master
-      - '[0-9].[0-9]'
       - '[0-9].x'
+      - '[0-9].[0-9].x'
   pull_request:
     branches:
       - master
-      - '[0-9].[0-9]'
       - '[0-9].x'
+      - '[0-9].[0-9].x'
   schedule:
     - cron: '0 1 * * *' # nightly build
+  workflow_dispatch:
 
 jobs:
 

.github/workflows/snapshot.yml

@@ -6,7 +6,8 @@ on:
   push:
     branches:
       - master
-      - '[0-9].[0-9]'
+      - '[0-9].x'
+  workflow_dispatch:
 
 jobs:
 

README.md

@@ -14,6 +14,20 @@ Jedis is a Java client for [Redis](https://github.com/redis/redis "Redis") desig
 
 Are you looking for a high-level library to handle object mapping? See [redis-om-spring](https://github.com/redis/redis-om-spring)!
 
+## How do I Redis?
+
+[Learn for free at Redis University](https://university.redis.com/)
+
+[Build faster with the Redis Launchpad](https://launchpad.redis.com/)
+
+[Try the Redis Cloud](https://redis.com/try-free/)
+
+[Dive in developer tutorials](https://developer.redis.com/)
+
+[Join the Redis community](https://redis.com/community/)
+
+[Work at Redis](https://redis.com/company/careers/jobs/)
+
 ## Supported Redis versions
 
 The most recent version of this library supports redis version 

pom.xml

@@ -60,19 +60,34 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-pool2</artifactId>
-			<version>2.11.1</version>
+			<version>2.12.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20230618</version>
+			<version>20231013</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 			<version>2.10.1</version>
 		</dependency>
 
+		<!-- UNIX socket connection support -->
+		<dependency>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-core</artifactId>
+			<version>2.8.1</version>
+			<type>pom</type>
+			<scope>test</scope>
+		</dependency>
+		<!-- Well-known text representation of geometry in RediSearch support -->
+		<dependency>
+			<groupId>org.locationtech.jts</groupId>
+			<artifactId>jts-core</artifactId>
+			<version>1.19.0</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -91,13 +106,6 @@
 			<version>${slf4j.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-core</artifactId>
-			<version>2.6.1</version>
-			<type>pom</type>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-inline</artifactId>
@@ -212,7 +220,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.6.0</version>
 				<configuration>
 					<source>8</source><!-- Until JDK 11+ -->
 					<detectJavaApiLink>false</detectJavaApiLink><!-- Until JDK 11+ -->

src/main/java/redis/clients/jedis/BuilderFactory.java

@@ -1821,13 +1821,11 @@ public String toString() {
     }
   };
 
-  public static final Builder<List<LibraryInfo>> LIBRARY_LIST = new Builder<List<LibraryInfo>>() {
-    @Override
-    public List<LibraryInfo> build(Object data) {
-      List<Object> list = (List<Object>) data;
-      return list.stream().map(o -> LibraryInfo.LIBRARY_BUILDER.build(o)).collect(Collectors.toList());
-    }
-  };
+  /**
+   * @deprecated Use {@link LibraryInfo#LIBRARY_INFO_LIST}.
+   */
+  @Deprecated
+  public static final Builder<List<LibraryInfo>> LIBRARY_LIST = LibraryInfo.LIBRARY_INFO_LIST;
 
   public static final Builder<List<List<String>>> STRING_LIST_LIST = new Builder<List<List<String>>>() {
     @Override

src/main/java/redis/clients/jedis/CommandArguments.java

@@ -82,6 +82,11 @@ public final CommandArguments keys(Object... keys) {
     return this;
   }
 
+  public final CommandArguments keys(Collection keys) {
+    keys.forEach(key -> key(key));
+    return this;
+  }
+
   public final CommandArguments addParams(IParams params) {
     params.addParams(this);
     return this;