From ae5a66ed1b6e1caab69e34cd44ce791010b6d204 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Nov 2016 21:09:03 -0500 Subject: [PATCH] Re-add dependency reduced pom Learned the correct way to handle that file --- Spigot-API-Patches/0001-POM-changes.patch | 14 ++++++++++++-- Spigot-Server-Patches/0001-POM-Changes.patch | 6 +++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 9b0058a900..6fbd856a68 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From b3731bee34a4bb6ddd06bc47e1b0c9631aabcec9 Mon Sep 17 00:00:00 2001 +From ac84151c8a02652a1137b7853894796dba4c3df3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 17:16:08 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 2ccc205..1ce6a91 100644 +index 2ccc205..6e0250c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,35 +4,37 @@ @@ -122,6 +122,16 @@ index 2ccc205..1ce6a91 100644 org.apache.maven.plugins maven-shade-plugin 2.4.3 +@@ -161,8 +158,7 @@ + + + +- +- false ++ ${project.build.directory}/dependency-reduced-pom.xml + + true + -- 2.10.2 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 2cb4e1a221..06763ec3bc 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From ef4a8ce2c0397b24187bd98015ccc83c33f14062 Mon Sep 17 00:00:00 2001 +From 0e7f1c733e810fc4e95da50c1c21214b500ca44e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 165863b..87f438c 100644 +index c5fd4d0..2fa1925 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -145,7 +145,7 @@ index 165863b..87f438c 100644 shade -+ false ++ ${project.build.directory}/dependency-reduced-pom.xml - - joptsimple