diff --git a/BungeeCord b/BungeeCord index cb60d08..53cc324 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit cb60d08ee727d94381eef78a4ebd7de01a1d7d65 +Subproject commit 53cc3242e1d2786c34b2e138d233c4eeca8e3b1d diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch index 0f6545a..d00f9a3 100644 --- a/BungeeCord-Patches/0001-POM-Changes.patch +++ b/BungeeCord-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 10aa49668e02fea51e8db4edff6346f37fe6a217 Mon Sep 17 00:00:00 2001 +From ff34e0182c9ec7f73c578fb14b1336be6ac2ca0e Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 10:33:31 -0700 Subject: [PATCH] POM Changes @@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes Require Java 8 diff --git a/api/pom.xml b/api/pom.xml -index 43a4dd9..bc7911a 100644 +index 43a4dd94..bc7911a0 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,42 +4,42 @@ @@ -66,7 +66,7 @@ index 43a4dd9..bc7911a 100644 compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index 5c42c6f..bcc098f 100644 +index 5c42c6fa..bcc098ff 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -4,19 +4,19 @@ @@ -125,7 +125,7 @@ index 5c42c6f..bcc098f 100644 ${maven.build.timestamp} diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java -index b7cb81e..a4516ed 100644 +index b7cb81e2..a4516ed9 100644 --- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java +++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java @@ -5,9 +5,9 @@ public class Bootstrap @@ -141,7 +141,7 @@ index b7cb81e..a4516ed 100644 return; } diff --git a/chat/pom.xml b/chat/pom.xml -index e8f3fd6..5e5e141 100644 +index e8f3fd6c..5e5e141a 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -4,23 +4,24 @@ @@ -178,7 +178,7 @@ index e8f3fd6..5e5e141 100644 diff --git a/config/pom.xml b/config/pom.xml -index 5d32d0e..28775e1 100644 +index 5d32d0e8..28775e19 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,19 +4,19 @@ @@ -208,7 +208,7 @@ index 5d32d0e..28775e1 100644 diff --git a/event/pom.xml b/event/pom.xml -index 65a6422..784be89 100644 +index 65a64224..784be89c 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -4,17 +4,17 @@ @@ -236,7 +236,7 @@ index 65a6422..784be89 100644 + Generic java event dispatching API intended for use with Waterfall. diff --git a/log/pom.xml b/log/pom.xml -index 22a933f..bbccf73 100644 +index 22a933f2..bbccf735 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -4,19 +4,19 @@ @@ -277,7 +277,7 @@ index 22a933f..bbccf73 100644 compile diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml -index 223d0f6..56d006d 100644 +index 223d0f6f..56d006db 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -4,14 +4,14 @@ @@ -300,7 +300,7 @@ index 223d0f6..56d006d 100644 jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml -index 7635889..8ce35aa 100644 +index 7635889d..8ce35aac 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -4,14 +4,14 @@ @@ -323,7 +323,7 @@ index 7635889..8ce35aa 100644 jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml -index 76158bc..926f2ff 100644 +index 76158bcb..926f2ffc 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -4,14 +4,14 @@ @@ -346,7 +346,7 @@ index 76158bc..926f2ff 100644 jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml -index 8737541..e028c34 100644 +index 87375419..e028c34f 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -4,14 +4,14 @@ @@ -369,7 +369,7 @@ index 8737541..e028c34 100644 jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml -index 8a0ed9d..2961a64 100644 +index 8a0ed9de..2961a64f 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -4,14 +4,14 @@ @@ -392,7 +392,7 @@ index 8a0ed9d..2961a64 100644 jar diff --git a/module/pom.xml b/module/pom.xml -index 2d51746..009b68b 100644 +index 2d517465..009b68b3 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -4,19 +4,19 @@ @@ -439,7 +439,7 @@ index 2d51746..009b68b 100644 compile diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml -index c08ad70..06159ba 100644 +index c08ad70d..06159baa 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -4,14 +4,14 @@ @@ -462,7 +462,7 @@ index c08ad70..06159ba 100644 jar diff --git a/native/pom.xml b/native/pom.xml -index 940d257..18861da 100644 +index 940d257e..18861dac 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -4,19 +4,19 @@ @@ -492,7 +492,7 @@ index 940d257..18861da 100644 diff --git a/pom.xml b/pom.xml -index facd3bd..16601fc 100644 +index a8686e1a..4484f715 100644 --- a/pom.xml +++ b/pom.xml @@ -4,23 +4,24 @@ @@ -587,7 +587,7 @@ index facd3bd..16601fc 100644 + unknown - 4.1.7.Final + 4.1.9.Final - 1.7 - 1.7 + @@ -687,7 +687,7 @@ index facd3bd..16601fc 100644 + diff --git a/protocol/pom.xml b/protocol/pom.xml -index 63d0498..3421be0 100644 +index 63d04980..3421be02 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -4,24 +4,24 @@ @@ -724,7 +724,7 @@ index 63d0498..3421be0 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index 850ab86..d8372c4 100644 +index 850ab860..d8372c41 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,18 @@ @@ -795,7 +795,7 @@ index 850ab86..d8372c4 100644 compile diff --git a/query/pom.xml b/query/pom.xml -index fbadb18..349d5cc 100644 +index fbadb189..349d5cc5 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -4,19 +4,19 @@ @@ -836,5 +836,5 @@ index fbadb18..349d5cc 100644 compile -- -2.10.0 +2.12.0