From 8fa05e383817990f9ad6ca2e857f9c5cdabc2d73 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Thu, 2 Mar 2023 23:06:37 -0600 Subject: [PATCH] Update dependencies and Gradle --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 61500 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- proxy/build.gradle.kts | 8 ++-- server/build.gradle | 38 +++++++++--------- .../plex/storage/player/MongoPlayerData.java | 29 +++++++------ 6 files changed, 39 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index 52b5c47..7eb3fd4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "maven-publish" - id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.github.johnrengelman.shadow" version "8.1.0" } group = "dev.plex" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c7205ef0dd041cc1af2d8f64f725598b5d34280..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644 GIT binary patch delta 13970 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 delta 13829 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..fc10b60 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts index 300b134..8fd252b 100644 --- a/proxy/build.gradle.kts +++ b/proxy/build.gradle.kts @@ -7,7 +7,7 @@ version = rootProject.version description = "Plex-Velocity" repositories { - maven { url = uri("https://papermc.io/repo/repository/maven-public/") } + maven { url = uri("https://repo.papermc.io/repository/maven-public/") } } tasks.getByName("jar") { @@ -37,9 +37,9 @@ publishing { } dependencies { - compileOnly("org.projectlombok:lombok:1.18.24") - annotationProcessor("org.projectlombok:lombok:1.18.24") - compileOnly("org.json:json:20220924") + compileOnly("org.projectlombok:lombok:1.18.26") + annotationProcessor("org.projectlombok:lombok:1.18.26") + compileOnly("org.json:json:20230227") compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") } \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 0f5a139..636c6fc 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,33 +1,33 @@ plugins { - id "net.minecrell.plugin-yml.bukkit" version "0.5.2" + id "net.minecrell.plugin-yml.bukkit" version "0.5.3" } dependencies { - library "org.projectlombok:lombok:1.18.24" - annotationProcessor "org.projectlombok:lombok:1.18.24" - library "org.json:json:20220924" + library "org.projectlombok:lombok:1.18.26" + annotationProcessor "org.projectlombok:lombok:1.18.26" + library "org.json:json:20230227" library "commons-io:commons-io:2.11.0" - library "dev.morphia.morphia:morphia-core:2.2.10" + library "dev.morphia.morphia:morphia-core:2.3.0" library "redis.clients:jedis:4.3.1" - library "org.mariadb.jdbc:mariadb-java-client:3.1.0" + library "org.mariadb.jdbc:mariadb-java-client:3.1.2" library "com.zaxxer:HikariCP:5.0.1" - library "org.apache.httpcomponents.client5:httpclient5:5.2" + library "org.apache.httpcomponents.client5:httpclient5:5.2.1" library "org.apache.commons:commons-lang3:3.12.0" - library "org.apache.maven.resolver:maven-resolver-api:1.9.1" - library "org.apache.maven.resolver:maven-resolver-impl:1.9.1" - library "org.apache.maven.resolver:maven-resolver-connector-basic:1.9.1" - library "org.apache.maven.resolver:maven-resolver-transport-http:1.9.1" - library "org.apache.maven:maven-resolver-provider:3.8.5" - library "org.eclipse.jetty:jetty-server:11.0.12" - library "org.eclipse.jetty:jetty-servlet:11.0.12" - library "org.eclipse.jetty:jetty-proxy:11.0.12" - library "com.google.code.gson:gson:2.10" - compileOnly "io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT" + library "org.apache.maven.resolver:maven-resolver-api:1.9.5" + library "org.apache.maven.resolver:maven-resolver-impl:1.9.5" + library "org.apache.maven.resolver:maven-resolver-connector-basic:1.9.5" + library "org.apache.maven.resolver:maven-resolver-transport-http:1.9.5" + library "org.apache.maven:maven-resolver-provider:3.9.0" + library "org.eclipse.jetty:jetty-server:11.0.14" + library "org.eclipse.jetty:jetty-servlet:11.0.14" + library "org.eclipse.jetty:jetty-proxy:11.0.14" + library "com.google.code.gson:gson:2.10.1" + compileOnly "io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT" compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") { exclude group: "org.bukkit", module: "bukkit" } - implementation "org.bstats:bstats-base:3.0.0" - implementation "org.bstats:bstats-bukkit:3.0.0" + implementation "org.bstats:bstats-base:3.0.1" + implementation "org.bstats:bstats-bukkit:3.0.1" } group = rootProject.group diff --git a/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java b/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java index 5b2e8d2..adea435 100644 --- a/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java +++ b/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java @@ -3,8 +3,8 @@ package dev.plex.storage.player; import dev.morphia.Datastore; import dev.morphia.query.Query; import dev.morphia.query.Update; -import dev.morphia.query.experimental.filters.Filters; -import dev.morphia.query.experimental.updates.UpdateOperators; +import dev.morphia.query.filters.Filters; +import dev.morphia.query.updates.UpdateOperators; import dev.plex.Plex; import dev.plex.player.PlexPlayer; import java.util.Collections; @@ -111,19 +111,18 @@ public class MongoPlayerData Query filter = datastore.find(PlexPlayer.class) .filter(Filters.eq("uuid", player.getUuid())); - Update updateOps = filter - .update( - UpdateOperators.set("name", player.getName()), - UpdateOperators.set("loginMessage", player.getLoginMessage()), - UpdateOperators.set("prefix", player.getPrefix()), - UpdateOperators.set("vanished", player.isVanished()), - UpdateOperators.set("commandSpy", player.isCommandSpy()), - UpdateOperators.set("adminActive", player.isAdminActive()), - UpdateOperators.set("rank", player.getRank().toLowerCase()), - UpdateOperators.set("ips", player.getIps()), - UpdateOperators.set("coins", player.getCoins()), - UpdateOperators.set("punishments", player.getPunishments()), - UpdateOperators.set("notes", player.getNotes())); + Update updateOps = filter.update( + UpdateOperators.set("name", player.getName()), + UpdateOperators.set("loginMessage", player.getLoginMessage()), + UpdateOperators.set("prefix", player.getPrefix()), + UpdateOperators.set("vanished", player.isVanished()), + UpdateOperators.set("commandSpy", player.isCommandSpy()), + UpdateOperators.set("adminActive", player.isAdminActive()), + UpdateOperators.set("rank", player.getRank().toLowerCase()), + UpdateOperators.set("ips", player.getIps()), + UpdateOperators.set("coins", player.getCoins()), + UpdateOperators.set("punishments", player.getPunishments()), + UpdateOperators.set("notes", player.getNotes())); updateOps.execute(); }