Relocate other libraries Spigot added and relocates in 1.17

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

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")
 +    }