Merge remote-tracking branch 'redis/master' into xread-block-2

Author: sazzad16

.circleci/config.yml

@@ -17,9 +17,6 @@ executors:
   linux-8-jdk:
     docker:
       - image: circleci/openjdk:8-jdk
-  linux-7-jdk:
-    docker:
-      - image: circleci/openjdk:7-jdk
 
 jobs:
   build:
@@ -70,5 +67,4 @@ workflows:
       - build:
           matrix:
             parameters:
-#              os: [linux-8-jdk, linux-7-jdk]
               os: [linux-8-jdk]

.github/release-drafter-config.yml

@@ -0,0 +1,21 @@
+name-template: 'Version $NEXT_PATCH_VERSION🌈'
+tag-template: 'v$NEXT_PATCH_VERSION'
+categories:
+  - title: '🚀Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: 'Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰Maintenance'
+    label: 'chore'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+exclude-labels:
+  - 'skip-changelog'
+template: |
+  ## Changes
+
+  $CHANGES

Makefile

@@ -236,6 +236,17 @@ save ""
 appendonly no
 endef
 
+# UNAVAILABLE REDIS NODES
+define REDIS_UNAVAILABLE_CONF
+daemonize yes
+protected-mode no
+port 6400
+pidfile /tmp/redis_unavailable.pid
+logfile /tmp/redis_unavailable.log
+save ""
+appendonly no
+endef
+
 #STUNNEL
 define STUNNEL_CONF
 cert = src/test/resources/private.pem
@@ -278,6 +289,7 @@ export REDIS_CLUSTER_NODE3_CONF
 export REDIS_CLUSTER_NODE4_CONF
 export REDIS_CLUSTER_NODE5_CONF
 export REDIS_UDS
+export REDIS_UNAVAILABLE_CONF
 export STUNNEL_CONF
 export STUNNEL_BIN
 
@@ -309,6 +321,7 @@ start: stunnel cleanup
 	echo "$$REDIS_CLUSTER_NODE4_CONF" | redis-server -
 	echo "$$REDIS_CLUSTER_NODE5_CONF" | redis-server -
 	echo "$$REDIS_UDS" | redis-server -
+	echo "$$REDIS_UNAVAILABLE_CONF" | redis-server -
 
 cleanup:
 	- rm -vf /tmp/redis_cluster_node*.conf 2>/dev/null
@@ -338,6 +351,7 @@ stop:
 	kill `cat /tmp/redis_cluster_node5.pid` || true
 	kill `cat /tmp/redis_uds.pid` || true
 	kill `cat /tmp/stunnel.pid` || true
+	[ -f /tmp/redis_unavailable.pid ] && kill `cat /tmp/redis_unavailable.pid` || true
 	rm -f /tmp/sentinel1.conf
 	rm -f /tmp/sentinel2.conf
 	rm -f /tmp/sentinel3.conf

README.md

@@ -58,17 +58,7 @@ Or use it as a maven dependency:
 <dependency>
     <groupId>redis.clients</groupId>
     <artifactId>jedis</artifactId>
-    <version>3.4.1</version>
-    <type>jar</type>
-    <scope>compile</scope>
-</dependency>
-```
-
-```xml
-<dependency>
-    <groupId>redis.clients</groupId>
-    <artifactId>jedis</artifactId>
-    <version>2.10.2</version>
+    <version>3.5.1</version>
     <type>jar</type>
     <scope>compile</scope>
 </dependency>
@@ -86,12 +76,13 @@ Or use it as a maven dependency:
 ```
 
 and
+
 ```xml
   <dependencies>
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.6.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 ```
@@ -147,14 +138,15 @@ Thanks for helping!
 
 ![RedisLabs Logo](logo-redislabs.png)
 
+---
+
+![YourKit Logo](https://cloud.githubusercontent.com/assets/1317309/4507430/7119527c-4b0c-11e4-9245-d72e751e26ee.png)
 
 YourKit supports open source projects with its full-featured Java Profiler.
 YourKit, LLC is the creator of [YourKit Java Profiler](http://www.yourkit.com/java/profiler/index.jsp) 
 and [YourKit .NET Profiler](http://www.yourkit.com/.net/profiler/index.jsp),
 innovative and intelligent tools for profiling Java and .NET applications.
 
-![YourKit Logo](https://cloud.githubusercontent.com/assets/1317309/4507430/7119527c-4b0c-11e4-9245-d72e751e26ee.png)
-
 ## License
 
 Copyright (c) 2011 Jonathan Leibiusky

pom.xml

@@ -1,25 +1,26 @@
 <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">
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>7</version>
+	</parent>
+
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
 	<groupId>redis.clients</groupId>
 	<artifactId>jedis</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>3.6.0-SNAPSHOT</version>
 	<name>Jedis</name>
 	<description>Jedis is a blazingly small and sane Redis java client.</description>
-  <url>https://github.com/redis/jedis</url>
+	<url>https://github.com/redis/jedis</url>
 
 	<mailingLists>
 		<mailingList>
 			<name>Jedis Mailing List</name>
 			<post>jedis_redis@googlegroups.com</post>
 			<archive>
-        http://groups.google.com/group/jedis_redis
-      </archive>
+				http://groups.google.com/group/jedis_redis
+			</archive>
 		</mailingList>
 	</mailingLists>
 
@@ -36,18 +37,19 @@
 		<url>http://github.com/redis/jedis/issues</url>
 	</issueManagement>
 
-  <scm>
-    <connection>scm:git:git@github.com:redis/jedis.git</connection>
-    <url>scm:git:git@github.com:redis/jedis.git</url>
-    <developerConnection>scm:git:git@github.com:redis/jedis.git</developerConnection>
-    <tag>jedis-2.2.0</tag>
-  </scm>
+	<scm>
+		<connection>scm:git:git@github.com:redis/jedis.git</connection>
+		<url>scm:git:git@github.com:redis/jedis.git</url>
+		<developerConnection>scm:git:git@github.com:redis/jedis.git</developerConnection>
+		<tag>jedis-3.4.1</tag>
+	</scm>
 
 	<properties>
 		<redis-hosts>localhost:6379,localhost:6380,localhost:6381,localhost:6382,localhost:6383,localhost:6384,localhost:6385,localhost:6386</redis-hosts>
 		<sentinel-hosts>localhost:26379,localhost:26380,localhost:26381</sentinel-hosts>
 		<cluster-hosts>localhost:7379,localhost:7380,localhost:7381,localhost:7382,localhost:7383,localhost:7384,localhost:7385</cluster-hosts>
-    	<github.global.server>github</github.global.server>
+		<github.global.server>github</github.global.server>
+		<log4j.version>2.13.3</log4j.version>
 	</properties>
 
 	<dependencies>
@@ -59,7 +61,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-pool2</artifactId>
-			<version>2.6.2</version>
+			<version>2.9.0</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -74,19 +76,19 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.13.2</version>
+			<version>${log4j.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.11.1</version>
+			<version>${log4j.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.kohlschutter.junixsocket</groupId>
 			<artifactId>junixsocket-core</artifactId>
-			<version>2.3.1</version>
+			<version>2.3.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -124,66 +126,61 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19.1</version>
+				<version>2.22.2</version>
 				<configuration>
 					<systemPropertyVariables>
 						<redis-hosts>${redis-hosts}</redis-hosts>
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
+				<version>3.2.1</version>
 				<configuration>
 					<attach>true</attach>
 				</configuration>
-                                <executions>
-                                    <execution>
-                                        <id>attach-sources</id>
-                                        <goals>
-                                            <goal>jar</goal>
-                                        </goals>
-                                    </execution>
-                                </executions>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
+				<version>2.10.4</version>
 				<configuration>
 					<aggregate>true</aggregate>
 					<additionalparam>-Xdoclint:none</additionalparam>
 				</configuration>
-                                <executions>
-                                    <execution>
-                                        <id>attach-javadoc</id>
-                                        <goals>
-                                            <goal>jar</goal>
-                                        </goals>
-                                    </execution>
-                                </executions>
+				<executions>
+					<execution>
+						<id>attach-javadoc</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.4.2</version>
+				<version>2.5.3</version>
 			</plugin>
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
+				<version>1.6.8</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>
@@ -200,26 +197,26 @@
 				</configuration>
 			</plugin>
 			<plugin>
-			  <artifactId>maven-jar-plugin</artifactId>
-			  <version>2.6</version>
-			  <configuration>
-			    <archive>  
-			      <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-			    </archive> 
-			  </configuration>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<configuration>
+					<archive>  
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive> 
+				</configuration>
 			</plugin> 
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>2.5.3</version>		
+				<version>4.2.1</version>
 				<executions>
-				    <execution>
-				      <id>bundle-manifest</id>
-				      <phase>process-classes</phase>
-				      <goals>    
-				        <goal>manifest</goal>
-				      </goals>   
-				    </execution>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>    
+							<goal>manifest</goal>
+						</goals>   
+					</execution>
 				</executions>		
 			</plugin>
 		</plugins>
@@ -231,9 +228,8 @@
 				<plugins>
 					<!--Sign the components - this is required by maven central for releases -->
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.5</version>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>