From 81c3fd30fc5fe4023636aca103f22774127750f5 Mon Sep 17 00:00:00 2001
From: jetoile <kmx.petals@gmail.Com>
Date: Tue, 20 Oct 2020 18:46:26 +0200
Subject: [PATCH] upgrade redis default to 6.0.8

---
 hadoop-unit-redis/pom.xml                                    | 2 +-
 .../src/main/resources/hadoop-unit-default.properties        | 2 +-
 .../java/fr/jetoile/hadoopunit/redis/EmbeddedRedisTest.java  | 5 ++++-
 .../src/test/resources/hadoop-unit-default.properties        | 2 +-
 .../src/main/resources/hadoop-unit-default.properties        | 2 +-
 sample/redis/pom.xml                                         | 2 +-
 .../redis/src/test/resources/hadoop-unit-default.properties  | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/hadoop-unit-redis/pom.xml b/hadoop-unit-redis/pom.xml
index c499d8e4..edbe7524 100644
--- a/hadoop-unit-redis/pom.xml
+++ b/hadoop-unit-redis/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>hadoop-unit-redis</artifactId>
 
     <properties>
-        <jedis.version>2.9.0</jedis.version>
+        <jedis.version>3.3.0</jedis.version>
     </properties>
 
     <dependencies>
diff --git a/hadoop-unit-redis/src/main/resources/hadoop-unit-default.properties b/hadoop-unit-redis/src/main/resources/hadoop-unit-default.properties
index 014f445d..532ef698 100644
--- a/hadoop-unit-redis/src/main/resources/hadoop-unit-default.properties
+++ b/hadoop-unit-redis/src/main/resources/hadoop-unit-default.properties
@@ -134,7 +134,7 @@ neo4j.temp.dir=/embedded_neo4j
 # Redis
 redis.port=6379
 redis.download.url=http://download.redis.io/releases/
-redis.version=4.0.0
+redis.version=6.0.8
 redis.cleanup.installation=false
 redis.temp.dir=/redis
 redis.type=SERVER
diff --git a/hadoop-unit-redis/src/test/java/fr/jetoile/hadoopunit/redis/EmbeddedRedisTest.java b/hadoop-unit-redis/src/test/java/fr/jetoile/hadoopunit/redis/EmbeddedRedisTest.java
index 919694ff..ff7e9532 100644
--- a/hadoop-unit-redis/src/test/java/fr/jetoile/hadoopunit/redis/EmbeddedRedisTest.java
+++ b/hadoop-unit-redis/src/test/java/fr/jetoile/hadoopunit/redis/EmbeddedRedisTest.java
@@ -32,7 +32,7 @@ public static void setup() throws BootstrapException {
     public void redis_installation_should_succeed() throws IOException, InterruptedException {
         String version = configuration.getString(RedisConfig.REDIS_VERSION_KEY);
         String downloadUrl = configuration.getString(RedisConfig.REDIS_DOWNLOAD_URL_KEY);
-        String tmpDir = configuration.getString(RedisConfig.REDIS_TMP_DIR_KEY);
+        String tmpDir = getTmpDirPath(configuration, RedisConfig.REDIS_TMP_DIR_KEY);
 
         EmbeddedRedisInstaller.builder()
                 .version(version)
@@ -45,4 +45,7 @@ public void redis_installation_should_succeed() throws IOException, InterruptedE
         assertThat(new File(System.getProperty("user.home") + "/.redis/redis-" + version + "/src/redis-server")).exists();
     }
 
+    private String getTmpDirPath(Configuration configuration, String componentTmpPathKey) {
+        return configuration.getString(HadoopUnitConfig.TMP_DIR_PATH_KEY, "/tmp") + configuration.getString(componentTmpPathKey);
+    }
 }
\ No newline at end of file
diff --git a/hadoop-unit-redis/src/test/resources/hadoop-unit-default.properties b/hadoop-unit-redis/src/test/resources/hadoop-unit-default.properties
index ea88086a..a629a801 100644
--- a/hadoop-unit-redis/src/test/resources/hadoop-unit-default.properties
+++ b/hadoop-unit-redis/src/test/resources/hadoop-unit-default.properties
@@ -133,7 +133,7 @@ neo4j.temp.dir=/embedded_neo4j
 # Redis
 redis.port=6379
 redis.download.url=http://download.redis.io/releases/
-redis.version=5.0.4
+redis.version=6.0.8
 redis.cleanup.installation=false
 redis.temp.dir=/redis
 redis.type=SERVER
diff --git a/hadoop-unit-standalone/src/main/resources/hadoop-unit-default.properties b/hadoop-unit-standalone/src/main/resources/hadoop-unit-default.properties
index 05f37a88..1b880509 100644
--- a/hadoop-unit-standalone/src/main/resources/hadoop-unit-default.properties
+++ b/hadoop-unit-standalone/src/main/resources/hadoop-unit-default.properties
@@ -385,7 +385,7 @@ alluxio.webapp.directory=conf/alluxio/webapp
 # Redis
 redis.port=6379
 redis.download.url=http://download.redis.io/releases/
-redis.version=5.0.4
+redis.version=6.0.8
 redis.cleanup.installation=false
 redis.temp.dir=/redis
 redis.type=SERVER
diff --git a/sample/redis/pom.xml b/sample/redis/pom.xml
index 43b249b3..d62256c3 100644
--- a/sample/redis/pom.xml
+++ b/sample/redis/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>redis</artifactId>
 
     <properties>
-        <jedis.version>2.9.0</jedis.version>
+        <jedis.version>3.3.0</jedis.version>
     </properties>
 
     <dependencies>
diff --git a/sample/redis/src/test/resources/hadoop-unit-default.properties b/sample/redis/src/test/resources/hadoop-unit-default.properties
index 232f0019..6cc2fccd 100644
--- a/sample/redis/src/test/resources/hadoop-unit-default.properties
+++ b/sample/redis/src/test/resources/hadoop-unit-default.properties
@@ -186,7 +186,7 @@ alluxio.webapp.directory=conf/alluxio/webapp
 # Redis
 redis.port=6379
 redis.download.url=http://download.redis.io/releases/
-redis.version=4.0.0
+redis.version=6.0.8
 redis.cleanup.installation=false
 redis.temp.dir=/redis
 redis.type=SERVER