From 5cfcc66b4ffc5b0ac43138500b7f0d2192a56014 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 22 Sep 2018 12:58:09 -0400 Subject: [PATCH] Fix up maven stuff hopefully --- ...low-plugins-to-use-SLF4J-for-logging.patch | 2 +- Spigot-API-Patches/POM-changes.patch | 23 ++++++++----------- .../Use-ASM-for-event-executors.patch | 2 +- .../add-Trove-and-FastUtil-to-Bukkit.patch | 2 +- pom.xml | 4 ++-- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch index f279ab7b9a..63c609d8f4 100644 --- a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index a58d4424..a771e156 100644 +index ffedf2e7..67d40f03 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch index 0528243c57..dfe6a56720 100644 --- a/Spigot-API-Patches/POM-changes.patch +++ b/Spigot-API-Patches/POM-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 117a7f8cf..03894ccf3 100644 +index 117a7f8c..2a5846a1 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ @@ -39,22 +39,19 @@ index 117a7f8cf..03894ccf3 100644 UTF-8 - - +- +- - spigotmc-releases - https://hub.spigotmc.org/nexus/content/repositories/releases/ -+ destroystokyo-releases -+ https://destroystokyo.com/repo/repository/maven-releases/ - - +- +- - spigotmc-snapshots - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ -+ destroystokyo-snapshots -+ https://destroystokyo.com/repo/repository/maven-snapshots/ - - - -@@ -0,0 +0,0 @@ +- +- +- + + spigotmc-public https://hub.spigotmc.org/nexus/content/groups/public/ diff --git a/Spigot-API-Patches/Use-ASM-for-event-executors.patch b/Spigot-API-Patches/Use-ASM-for-event-executors.patch index 73e14cf556..73ac80aac2 100644 --- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index a8a87820..a58d4424 100644 +index d6cf92d1..ffedf2e7 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ diff --git a/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch index 4e40dacc8b..7035c64768 100644 --- a/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add Trove and FastUtil to Bukkit diff --git a/pom.xml b/pom.xml -index cc8fca48..f5e8d49d 100644 +index 2a5846a1..d6cf92d1 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ diff --git a/pom.xml b/pom.xml index 3db82aa7ad..3541b9580b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,11 +43,11 @@ - destroystokyo-releases + papermc-releases https://papermc.io/repo/repository/maven-releases/ - destroystokyo-snapshots + papermc-snapshots https://papermc.io/repo/repository/maven-snapshots/