diff --git a/build-logic/src/main/kotlin/geyser.platform-conventions.gradle.kts b/build-logic/src/main/kotlin/geyser.platform-conventions.gradle.kts
index 7a342783b..8f269437d 100644
--- a/build-logic/src/main/kotlin/geyser.platform-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.platform-conventions.gradle.kts
@@ -11,7 +11,7 @@ tasks {
                 "id" to "geyser",
                 "name" to "Geyser",
                 "version" to project.version,
-                "description" to project.description,
+                "description" to project.description as String,
                 "url" to "https://geysermc.org",
                 "author" to "GeyserMC"
             )
diff --git a/build-logic/src/main/kotlin/geyser.publish-conventions.gradle.kts b/build-logic/src/main/kotlin/geyser.publish-conventions.gradle.kts
index eca587721..036ee803c 100644
--- a/build-logic/src/main/kotlin/geyser.publish-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.publish-conventions.gradle.kts
@@ -7,9 +7,3 @@ indra {
     publishSnapshotsTo("geysermc", "https://repo.opencollab.dev/maven-snapshots")
     publishReleasesTo("geysermc", "https://repo.opencollab.dev/maven-releases")
 }
-
-publishing {
-    // skip shadow jar from publishing. Workaround for https://github.com/johnrengelman/shadow/issues/651
-    val javaComponent = project.components["java"] as AdhocComponentWithVariants
-    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) { skip() }
-}
\ No newline at end of file
diff --git a/build-logic/src/main/kotlin/geyser.shadow-conventions.gradle.kts b/build-logic/src/main/kotlin/geyser.shadow-conventions.gradle.kts
index c160e5ec6..675df5158 100644
--- a/build-logic/src/main/kotlin/geyser.shadow-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.shadow-conventions.gradle.kts
@@ -2,7 +2,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id("geyser.base-conventions")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
+}
+
+shadow {
+    addShadowVariantIntoJavaComponent = false
 }
 
 tasks {
@@ -33,4 +37,4 @@ tasks {
     named("build") {
         dependsOn(shadowJar)
     }
-}
\ No newline at end of file
+}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 5c7f34499..63c516224 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -59,8 +59,10 @@ dependencies {
     }
 
     // Test
+    testImplementation(platform("org.junit:junit-bom:6.0.0"))
     testImplementation(libs.junit)
     testImplementation(libs.mockito)
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     // Annotation Processors
     compileOnly(projects.ap)
@@ -108,7 +110,7 @@ fun isDevBuild(branch: String, repository: String): Boolean {
     return branch != "master" || repository.equals("https://github.com/GeyserMC/Geyser", ignoreCase = true).not()
 }
 
-inner class GitInfo {
+class GitInfo {
     val branch: String
     val commit: String
     val commitAbbrev: String
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 19e9b2607..8c08804d0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ minecraftauth = "4.1.1"
 mcprotocollib = "1.21.9-20251026.124736-17"
 adventure = "4.25.0"
 adventure-platform = "4.4.1"
-junit = "5.9.2"
+junit = "6.0.0"
 checkerframework = "3.19.0"
 log4j = "2.20.0"
 jline = "3.21.0"
@@ -47,7 +47,7 @@ runvelocityversion = "3.4.0-SNAPSHOT"
 
 # plugin versions
 indra = "3.1.3"
-shadow = "8.1.1"
+shadow = "9.2.2"
 architectury-plugin = "3.4-SNAPSHOT"
 architectury-loom = "1.11-SNAPSHOT"
 minotaur = "2.8.7"
@@ -149,7 +149,7 @@ mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 # plugins
 lombok = { group = "io.freefair.gradle", name = "lombok-plugin", version.ref = "lombok" }
 indra = { group = "net.kyori", name  = "indra-common", version.ref = "indra" }
-shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
+shadow = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }
 architectury-plugin = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
 architectury-loom = { group = "dev.architectury.loom", name = "dev.architectury.loom.gradle.plugin", version.ref = "architectury-loom" }
 minotaur = { group = "com.modrinth.minotaur", name = "Minotaur", version.ref = "minotaur" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index a4b76b953..000000000
Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4081da47..2e1113280 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-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME