From 4bdcca6566bf522a09e5d123e89ed745a518ebc9 Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 20 Feb 2022 22:41:58 +0000 Subject: [PATCH] Update mongodb driver --- common/build.gradle | 2 +- .../common/dependencies/Dependency.java | 32 ++++++++++++++++--- .../dependencies/DependencyRegistry.java | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index e4c43c1e2..b2137a5f0 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -72,6 +72,6 @@ dependencies { api 'com.zaxxer:HikariCP:4.0.3' api 'redis.clients:jedis:3.5.2' api 'com.rabbitmq:amqp-client:5.12.0' - api 'org.mongodb:mongo-java-driver:3.12.8' + api 'org.mongodb:mongodb-driver-legacy:4.5.0' api 'org.yaml:snakeyaml:1.28' } 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 8af936006..d45b30c89 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 @@ -197,11 +197,35 @@ public enum Dependency { "1.7.30", "zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=" ), - MONGODB_DRIVER( + MONGODB_DRIVER_CORE( "org.mongodb", - "mongo-java-driver", - "3.12.8", - "92uqr4qaL3dbw5wrb8sQWQqFxpzr/Y/DhForeyg3taI=", + "mongodb-driver-core", + "4.5.0", + "awqoW0ImUcrCTA2d1rDCjDLEjLMCrOjKWIcC7E+zLGA=", + Relocation.of("mongodb", "com{}mongodb"), + Relocation.of("bson", "org{}bson") + ), + MONGODB_DRIVER_LEGACY( + "org.mongodb", + "mongodb-driver-legacy", + "4.5.0", + "77KZGIr3KZmzBpN69rGOLXmnlJIBCXRl/U4gEIdlFhY=", + Relocation.of("mongodb", "com{}mongodb"), + Relocation.of("bson", "org{}bson") + ), + MONGODB_DRIVER_SYNC( + "org.mongodb", + "mongodb-driver-sync", + "4.5.0", + "q9XDSGJjlo/Ek6jHoCbqWnaK/dghB8y9aDM0hCLiSvk=", + Relocation.of("mongodb", "com{}mongodb"), + Relocation.of("bson", "org{}bson") + ), + MONGODB_DRIVER_BSON( + "org.mongodb", + "bson", + "4.5.0", + "6CFyEzxbdeiBEXdDBmcgqWs5dvicgFkBLU3MlQUIqRA=", Relocation.of("mongodb", "com{}mongodb"), Relocation.of("bson", "org{}bson") ), diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java index 0be355473..3dfc287bd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java @@ -55,7 +55,7 @@ public class DependencyRegistry { .putAll(StorageType.JSON_COMBINED, Dependency.CONFIGURATE_CORE, Dependency.CONFIGURATE_GSON) .putAll(StorageType.HOCON_COMBINED, Dependency.HOCON_CONFIG, Dependency.CONFIGURATE_CORE, Dependency.CONFIGURATE_HOCON) .putAll(StorageType.TOML_COMBINED, Dependency.TOML4J, Dependency.CONFIGURATE_CORE, Dependency.CONFIGURATE_TOML) - .putAll(StorageType.MONGODB, Dependency.MONGODB_DRIVER) + .putAll(StorageType.MONGODB, Dependency.MONGODB_DRIVER_CORE, Dependency.MONGODB_DRIVER_LEGACY, Dependency.MONGODB_DRIVER_SYNC, Dependency.MONGODB_DRIVER_BSON) .putAll(StorageType.MARIADB, Dependency.MARIADB_DRIVER, Dependency.SLF4J_API, Dependency.SLF4J_SIMPLE, Dependency.HIKARI) .putAll(StorageType.MYSQL, Dependency.MYSQL_DRIVER, Dependency.SLF4J_API, Dependency.SLF4J_SIMPLE, Dependency.HIKARI) .putAll(StorageType.POSTGRESQL, Dependency.POSTGRESQL_DRIVER, Dependency.SLF4J_API, Dependency.SLF4J_SIMPLE, Dependency.HIKARI)