From c837dd5cc81d7d60e2eef4515f3fc85f84d64fac Mon Sep 17 00:00:00 2001 From: Luck Date: Thu, 2 Feb 2017 16:00:18 +0000 Subject: [PATCH] fix jedis shading - closes #158 --- common/pom.xml | 2 +- .../lucko/luckperms/common/dependencies/Dependency.java | 2 +- .../lucko/luckperms/common/messaging/RedisMessaging.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index c8c23df1..51687d0f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -57,7 +57,7 @@ redis.clients jedis - 2.9.0-shaded + 2.9.1-shaded provided diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java index e7fb92b5..f046fbe1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java @@ -37,7 +37,7 @@ public enum Dependency { SLF4J_SIMPLE("https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/1.7.9/slf4j-simple-1.7.9.jar", "1.7.9", "org.slf4j.impl.SimpleLoggerFactory"), SLF4J_API("https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.9/slf4j-api-1.7.9.jar", "1.7.9", "org.slf4j.helpers.BasicMarkerFactory"), MONGODB_DRIVER("https://repo1.maven.org/maven2/org/mongodb/mongo-java-driver/3.4.1/mongo-java-driver-3.4.1.jar", "3.4.1", "com.mongodb.Mongo"), - JEDIS("https://github.com/lucko/jedis/releases/download/jedis-2.9.0-shaded/jedis-2.9.0-shaded.jar", "2.9.0-shaded", "redis.clients.jedis.Jedis"); + JEDIS("https://github.com/lucko/jedis/releases/download/jedis-2.9.1-shaded/jedis-2.9.1-shaded.jar", "2.9.1-shaded", "redis.clients.jedis.shaded.Jedis"); private final String url; private final String version; diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/RedisMessaging.java b/common/src/main/java/me/lucko/luckperms/common/messaging/RedisMessaging.java index d9fb5597..4ac55644 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/RedisMessaging.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/RedisMessaging.java @@ -26,10 +26,10 @@ import lombok.RequiredArgsConstructor; import me.lucko.luckperms.common.plugin.LuckPermsPlugin; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; -import redis.clients.jedis.JedisPoolConfig; -import redis.clients.jedis.JedisPubSub; +import redis.clients.jedis.shaded.Jedis; +import redis.clients.jedis.shaded.JedisPool; +import redis.clients.jedis.shaded.JedisPoolConfig; +import redis.clients.jedis.shaded.JedisPubSub; /** * An implementation of {@link me.lucko.luckperms.api.MessagingService} using Redis.