From b3a41368ce4207b1b7ebd1abfe2c8d4fd117891f Mon Sep 17 00:00:00 2001
From: mohammed jasem alaajel <34905970+ham1255@users.noreply.github.com>
Date: Thu, 7 Jan 2021 23:30:39 +0400
Subject: [PATCH] bumped dependices versoins and removed some unneded stuff
from pom file + added ssl SUPPORT!
---
pom.xml | 40 +++++++------------
.../minecraft/redisbungee/RedisBungee.java | 4 +-
src/main/resources/example_config.yml | 3 ++
src/main/resources/plugin.yml | 9 +++--
4 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index fab5549..4f24b79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.imaginarycode.minecraft
RedisBungee
- 0.5
+ 0.6-SNAPSHOT
@@ -15,39 +15,29 @@
-
- jenkins
- http://ci.md-5.net/job/RedisBungee/
-
-
-
-
- md_5-releases
- http://repo.md-5.net/content/repositories/releases/
-
-
- md_5-snapshots
- http://repo.md-5.net/content/repositories/snapshots/
-
-
-
2013
+
+
+ src/main/resources
+ true
+
+
org.apache.maven.plugins
maven-compiler-plugin
- 3.1
+ 3.8.1
-
- 1.7
+
+ 1.8
org.apache.maven.plugins
maven-shade-plugin
- 2.1
+ 3.2.4
package
@@ -98,19 +88,19 @@
redis.clients
jedis
- 2.9.0
+ 3.4.1
compile
org.apache.commons
commons-pool2
- 2.5.0
+ 2.6.2
compile
net.md-5
bungeecord-api
- 1.12-SNAPSHOT
+ 1.16-R0.4-SNAPSHOT
jar
provided
@@ -129,7 +119,7 @@
junit
junit
- 4.11
+ 4.13.1
test
diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
index b030110..4c53fd2 100644
--- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
+++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
@@ -19,7 +19,6 @@ import lombok.NonNull;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.api.scheduler.ScheduledTask;
import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration;
@@ -413,6 +412,7 @@ public final class RedisBungee extends Plugin {
final String redisServer = configuration.getString("redis-server", "localhost");
final int redisPort = configuration.getInt("redis-port", 6379);
+ final boolean useSSL = configuration.getBoolean("useSSL");
String redisPassword = configuration.getString("redis-password");
String serverId = configuration.getString("server-id");
@@ -433,7 +433,7 @@ public final class RedisBungee extends Plugin {
// Create the pool...
JedisPoolConfig config = new JedisPoolConfig();
config.setMaxTotal(configuration.getInt("max-redis-connections", 8));
- return new JedisPool(config, redisServer, redisPort, 0, finalRedisPassword);
+ return new JedisPool(config, redisServer, redisPort, 0, finalRedisPassword, useSSL);
}
});
diff --git a/src/main/resources/example_config.yml b/src/main/resources/example_config.yml
index e090bbc..ba1bbb9 100644
--- a/src/main/resources/example_config.yml
+++ b/src/main/resources/example_config.yml
@@ -12,6 +12,9 @@ redis-password: ""
# inefficient plugins or a lot of players.
max-redis-connections: 8
+# since redis can support ssl by version 6 you can use ssl in redis bungee too! (
+useSSL: false
+
# An identifier for this BungeeCord instance.
server-id: test1
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 076e980..b7f5976 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,9 @@
-name: RedisBungee
+name: ${project.name}
main: com.imaginarycode.minecraft.redisbungee.RedisBungee
-version: 0.5
-author: chunkr
+version: ${project.version}
+author: Chunker and Govindas limework
+authors:
+ - chunkr
+ - Govindas Limework
# This is used so that we can automatically override default BungeeCord behavior.
softDepends: ["cmd_find", "cmd_list"]
\ No newline at end of file