From f538a34f388f8f2ebef61e21a3b557d3eccb2e72 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Wed, 24 Nov 2021 16:53:30 -0800 Subject: [PATCH] Remove pom for paperclip install to maven local --- patches/server/Build-system-changes.patch | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index 63bca1ce9..db9d8e19c 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -38,25 +38,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 ) for (tld in setOf("net", "com", "org")) { attributes("$tld/bukkit", "Sealed" to true) -@@ -0,0 +0,0 @@ relocation { - } - } - -+val generatePom = tasks.named("generatePomFileForMavenPublication") -+ - tasks.shadowJar { - configurations = listOf(project.configurations.vanillaServer.get()) - archiveClassifier.set("mojang-mapped") - -+ // Needed for Paperclip's install to maven local feature // todo: are we keeping this? if so is this still correct? -+ from(generatePom) { -+ into("META-INF/maven/io.papermc.paper/paper") -+ rename { "pom.xml" } -+ } -+ - for (relocation in relocation.relocations.get()) { - relocate(relocation.fromPackage, relocation.toPackage) { - for (exclude in relocation.excludes) { 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