[karaf-decanter] branch master updated: [KARAF-6492] Upgrade to redisson 3.11.6

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git


The following commit(s) were added to refs/heads/master by this push:
     new 379474a  [KARAF-6492] Upgrade to redisson 3.11.6
     new 61b5683  Merge pull request #116 from jbonofre/KARAF-6492
379474a is described below

commit 379474a8a9a4228717743e05b8e0a405079fa033
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Sun Dec 8 16:52:39 2019 +0100

    [KARAF-6492] Upgrade to redisson 3.11.6
---
 appender/redis/pom.xml                                                | 2 +-
 .../java/org/apache/karaf/decanter/appender/redis/RedisAppender.java  | 4 ++--
 pom.xml                                                               | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/appender/redis/pom.xml b/appender/redis/pom.xml
index 1a353d7..7a72a8d 100644
--- a/appender/redis/pom.xml
+++ b/appender/redis/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
-            <version>${redisson.version}</version>
+            <version>3.11.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.decanter.appender</groupId>
diff --git 
a/appender/redis/src/main/java/org/apache/karaf/decanter/appender/redis/RedisAppender.java
 
b/appender/redis/src/main/java/org/apache/karaf/decanter/appender/redis/RedisAppender.java
index 04e55b4..34f9ae6 100644
--- 
a/appender/redis/src/main/java/org/apache/karaf/decanter/appender/redis/RedisAppender.java
+++ 
b/appender/redis/src/main/java/org/apache/karaf/decanter/appender/redis/RedisAppender.java
@@ -24,9 +24,9 @@ import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventConstants;
 import org.osgi.service.event.EventHandler;
-import org.redisson.Config;
 import org.redisson.Redisson;
-import org.redisson.RedissonClient;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
 
 import java.util.Dictionary;
 import java.util.Map;
diff --git a/pom.xml b/pom.xml
index 67ad4e5..4e21fad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,6 @@
         <kibana6.version>6.1.1</kibana6.version>
         <orientdb.version>2.2.31</orientdb.version>
         <paho.version>1.0.2</paho.version>
-        <redisson.version>2.2.8</redisson.version>
         <slf4j.version>1.7.7</slf4j.version>
     </properties>