Merge upstream + Fix build

BungeeCord

@@ -1 +1 @@
-Subproject commit 73a81ff2439864187f0b40a7273e375540cc6bdc
+Subproject commit 6958943123fe89bb2c1037078e065ec0f4fb2473

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From b7d1c8e5251a99a7758990a7e3297826c553c9fe Mon Sep 17 00:00:00 2001
+From cc7e0c242fc8e3d42c575e38cfd52052946d0262 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 10:33:31 -0700
 Subject: [PATCH] POM Changes
@@ -66,7 +66,7 @@ index 96a46738..2a3c5eae 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 8149db1e..90a1c378 100644
+index 9c02b389..f1b3a071 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,19 +4,19 @@
@@ -94,8 +94,8 @@ index 8149db1e..90a1c378 100644
 +    <description>Java 1.6 loader for Waterfall</description>
  
      <properties>
-         <maven.compiler.source>1.6</maven.compiler.source>
+         <maven.deploy.skip>true</maven.deploy.skip>
-@@ -26,8 +26,8 @@
+@@ -27,8 +27,8 @@
  
      <dependencies>
          <dependency>
@@ -106,7 +106,7 @@ index 8149db1e..90a1c378 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
      </dependencies>
  
      <build>
@@ -114,8 +114,8 @@ index 8149db1e..90a1c378 100644
 +        <finalName>Waterfall</finalName>
          <plugins>
              <plugin>
-                 <!-- Don't deploy proxy to maven repo, only APIs -->
+                 <groupId>org.apache.maven.plugins</groupId>
-@@ -57,7 +57,7 @@
+@@ -50,7 +50,7 @@
                  <configuration>
                      <archive>
                          <manifestEntries>
@@ -392,7 +392,7 @@ index daf146dc..e00697fe 100644
      <packaging>jar</packaging>
  
 diff --git a/module/pom.xml b/module/pom.xml
-index 20728c67..a4d581ec 100644
+index aff2c070..2b827bb0 100644
 --- a/module/pom.xml
 +++ b/module/pom.xml
 @@ -4,19 +4,19 @@
@@ -421,12 +421,13 @@ index 20728c67..a4d581ec 100644
  
      <modules>
          <module>cmd-alert</module>
-@@ -28,13 +28,13 @@
+@@ -28,14 +28,14 @@
      </modules>
  
      <properties>
 -        <module.author>SpigotMC</module.author>
 +        <module.author>WaterfallMC</module.author>
+         <maven.deploy.skip>true</maven.deploy.skip>
      </properties>
  
      <dependencies>
@@ -492,7 +493,7 @@ index 082f0908..8b045e3b 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index b35347ce..88f939df 100644
+index 5a03519e..144e3f14 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -4,23 +4,24 @@
@@ -724,7 +725,7 @@ index bf4b399a..9a4b6529 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 48c13305..1cd7afe0 100644
+index 3b36612c..85b9df7d 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -750,8 +751,8 @@ index 48c13305..1cd7afe0 100644
 +    <name>Waterfall-Proxy</name>
      <description>Proxy component of the Elastic Portal Suite</description>
  
-     <dependencies>
+     <properties>
-@@ -45,32 +45,32 @@
+@@ -49,32 +49,32 @@
              <scope>compile</scope>
          </dependency>
          <dependency>

BungeeCord-Patches/0040-Use-async-Netty-DNS-resolver.patch

@@ -1,4 +1,4 @@
-From 2a1f5297000df92b5acda072422f68137ae1d2a1 Mon Sep 17 00:00:00 2001
+From 4e5f8b6986efb9ca27fb5662c63869d82dfaf601 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 03:13:03 -0500
 Subject: [PATCH] Use async Netty DNS resolver
@@ -6,10 +6,10 @@ Subject: [PATCH] Use async Netty DNS resolver
 We no longer need to cache the address for the session server now.
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 99d4628..180b78d 100644
+index 85b9df7d..90dd3fa4 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -31,6 +31,14 @@
+@@ -35,6 +35,14 @@
              <version>${netty.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -25,7 +25,7 @@ index 99d4628..180b78d 100644
              <groupId>io.netty</groupId>
              <artifactId>netty-handler</artifactId>
 diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
-index 2feb4d6..7e381f5 100644
+index 2feb4d66..3db36399 100644
 --- a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
 +++ b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
 @@ -27,7 +27,11 @@ public class HttpClient
@@ -36,7 +36,7 @@ index 2feb4d6..7e381f5 100644
 +    // Waterfall Start - use async resolver from Netty
 +    //private static final Cache<String, InetAddress> addressCache = CacheBuilder.newBuilder().expireAfterWrite( 1, TimeUnit.MINUTES ).build(); // Waterfall - remove cache
 +    private static final io.netty.resolver.dns.DnsAddressResolverGroup dnsResolverGroup =
-+            new io.netty.resolver.dns.DnsAddressResolverGroup(PipelineUtils.getDatagramChannel(), io.netty.resolver.dns.DnsServerAddresses.defaultAddresses());
++            new io.netty.resolver.dns.DnsAddressResolverGroup(PipelineUtils.getDatagramChannel(), io.netty.resolver.dns.DefaultDnsServerAddressStreamProvider.INSTANCE);
 +    // Waterfall End
  
      @SuppressWarnings("UnusedAssignment")
@@ -94,7 +94,7 @@ index 2feb4d6..7e381f5 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index f6a10e7..ddf598e 100644
+index f6a10e77..ddf598ef 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 @@ -103,7 +103,7 @@ public class PipelineUtils
@@ -107,5 +107,5 @@ index f6a10e7..ddf598e 100644
          return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
      }
 -- 
-2.7.4
+2.13.0