From 3dc0a3fafcda7ec92790d1c9f53f650100ca9186 Mon Sep 17 00:00:00 2001
From: Kyle Wood <kyle@denwav.dev>
Date: Wed, 16 Jun 2021 20:56:44 -0500
Subject: [PATCH] Relocate other libraries Spigot added and relocates in 1.17

---
 patches/server/Build-system-changes.patch | 4 ++--
 patches/server/Setup-Gradle-project.patch | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch
index 123ac9e3a6..ee9f79dfa6 100644
--- a/patches/server/Build-system-changes.patch
+++ b/patches/server/Build-system-changes.patch
@@ -63,9 +63,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      listOf(
 -        "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
 +        "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil
-         "org.apache.commons.lang3", "org.objectweb.asm"
+         "org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus",
+         "org.eclipse.aether", "org.eclipse.sisu", "org.objectweb.asm"
      ).forEach { pack ->
-         relocate(pack, "org.bukkit.craftbukkit.libs.$pack")
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index 59edee3d30..598b1f9fda 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -103,7 +103,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    listOf(
 +        "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
-+        "org.apache.commons.lang3", "org.objectweb.asm"
++        "org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus",
++        "org.eclipse.aether", "org.eclipse.sisu", "org.objectweb.asm"
 +    ).forEach { pack ->
 +        relocate(pack, "org.bukkit.craftbukkit.libs.$pack")
 +    }