sync netty version with vanilla (#9842)

1 files changed, 6 insertions, 15 deletions

diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index ef01672983..8d8d538af8 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -9,7 +9,7 @@ public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afea2319815 100644
+index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..e8c4e7379d46b1ba88110729b8ccbde00c68ce55 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,10 +9,9 @@ plugins {
@@ -25,16 +25,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
      runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
-@@ -23,6 +22,8 @@ dependencies {
- 
-     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
-     testImplementation("org.hamcrest:hamcrest:2.2")
-+
-+    implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
- }
- 
- val craftbukkitPackageVersion = "1_20_R2" // Paper
-@@ -34,6 +35,7 @@ tasks.jar {
+@@ -34,6 +33,7 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
          val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@@ -42,7 +33,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
-@@ -42,6 +44,9 @@ tasks.jar {
+@@ -42,6 +42,9 @@ tasks.jar {
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
@@ -52,7 +43,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -49,6 +54,11 @@ tasks.jar {
+@@ -49,6 +52,11 @@ tasks.jar {
      }
  }
  
@@ -64,7 +55,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
  publishing {
      publications.create<MavenPublication>("maven") {
          artifact(tasks.shadowJar)
-@@ -75,6 +85,17 @@ tasks.shadowJar {
+@@ -75,6 +83,17 @@ tasks.shadowJar {
      }
  }
  
@@ -82,7 +73,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
  tasks.test {
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
      useJUnitPlatform()
-@@ -133,7 +154,14 @@ tasks.registerRunTask("runReobf") {
+@@ -133,7 +152,14 @@ tasks.registerRunTask("runReobf") {
      classpath(runtimeClasspathWithoutVanillaServer)
  }