Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 21:25:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2017-07-09 00:24:38 +01:00
parent 6ab69de258
commit 8edae227f6
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 9b3b42316f25a84530e3bbc8b3887ced4ad9838c Subproject commit caeb7246f0bdd6f8a35bee2ee64f0afd175df89d

44
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 6b641ee5ec07671f0ce61e39ecae641d7c2849f4 Mon Sep 17 00:00:00 2001 From ac3c09c9f54bf1dd42d45dcd63be12259f392dd1 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 10:33:31 -0700 Date: Thu, 19 May 2016 10:33:31 -0700
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Require Java 8 Require Java 8
diff --git a/api/pom.xml b/api/pom.xml diff --git a/api/pom.xml b/api/pom.xml
index 96a4673..2a3c5ea 100644 index 96a46738..2a3c5eae 100644
--- a/api/pom.xml --- a/api/pom.xml
+++ b/api/pom.xml +++ b/api/pom.xml
@@ -4,42 +4,42 @@ @@ -4,42 +4,42 @@
@ -66,7 +66,7 @@ index 96a4673..2a3c5ea 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 9c02b38..f1b3a07 100644 index 9c02b389..f1b3a071 100644
--- a/bootstrap/pom.xml --- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml +++ b/bootstrap/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -125,7 +125,7 @@ index 9c02b38..f1b3a07 100644
<Specification-Version>${maven.build.timestamp}</Specification-Version> <Specification-Version>${maven.build.timestamp}</Specification-Version>
</manifestEntries> </manifestEntries>
diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java 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 --- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
+++ b/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 @@ -5,9 +5,9 @@ public class Bootstrap
@ -141,7 +141,7 @@ index b7cb81e..a4516ed 100644
return; return;
} }
diff --git a/chat/pom.xml b/chat/pom.xml diff --git a/chat/pom.xml b/chat/pom.xml
index 970e309..a908c13 100644 index 970e3097..a908c13e 100644
--- a/chat/pom.xml --- a/chat/pom.xml
+++ b/chat/pom.xml +++ b/chat/pom.xml
@@ -4,23 +4,24 @@ @@ -4,23 +4,24 @@
@ -178,7 +178,7 @@ index 970e309..a908c13 100644
<dependencies> <dependencies>
diff --git a/config/pom.xml b/config/pom.xml diff --git a/config/pom.xml b/config/pom.xml
index 253bfdf..d314634 100644 index 253bfdff..d3146344 100644
--- a/config/pom.xml --- a/config/pom.xml
+++ b/config/pom.xml +++ b/config/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -208,7 +208,7 @@ index 253bfdf..d314634 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/event/pom.xml b/event/pom.xml diff --git a/event/pom.xml b/event/pom.xml
index 6132e8e..a387b2c 100644 index 6132e8e9..a387b2c0 100644
--- a/event/pom.xml --- a/event/pom.xml
+++ b/event/pom.xml +++ b/event/pom.xml
@@ -4,17 +4,17 @@ @@ -4,17 +4,17 @@
@ -236,7 +236,7 @@ index 6132e8e..a387b2c 100644
+ <description>Generic java event dispatching API intended for use with Waterfall.</description> + <description>Generic java event dispatching API intended for use with Waterfall.</description>
</project> </project>
diff --git a/log/pom.xml b/log/pom.xml diff --git a/log/pom.xml b/log/pom.xml
index 2fcbbad..b54e01a 100644 index 2fcbbad6..b54e01a0 100644
--- a/log/pom.xml --- a/log/pom.xml
+++ b/log/pom.xml +++ b/log/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -277,7 +277,7 @@ index 2fcbbad..b54e01a 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 220f042..2d81204 100644 index 220f0421..2d81204b 100644
--- a/module/cmd-alert/pom.xml --- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -300,7 +300,7 @@ index 220f042..2d81204 100644
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 928f63a..f22790a 100644 index 928f63a8..f22790a3 100644
--- a/module/cmd-find/pom.xml --- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -323,7 +323,7 @@ index 928f63a..f22790a 100644
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 689b83e..0e693f1 100644 index 689b83ee..0e693f11 100644
--- a/module/cmd-list/pom.xml --- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -346,7 +346,7 @@ index 689b83e..0e693f1 100644
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index e50a4be..ba6de23 100644 index e50a4bec..ba6de230 100644
--- a/module/cmd-send/pom.xml --- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -369,7 +369,7 @@ index e50a4be..ba6de23 100644
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index daf146d..e00697f 100644 index daf146dc..e00697fe 100644
--- a/module/cmd-server/pom.xml --- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -392,7 +392,7 @@ index daf146d..e00697f 100644
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml diff --git a/module/pom.xml b/module/pom.xml
index aff2c07..2b827bb 100644 index aff2c070..2b827bb0 100644
--- a/module/pom.xml --- a/module/pom.xml
+++ b/module/pom.xml +++ b/module/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -440,7 +440,7 @@ index aff2c07..2b827bb 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 8e82446..091ea8c 100644 index 8e82446f..091ea8cf 100644
--- a/module/reconnect-yaml/pom.xml --- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -463,7 +463,7 @@ index 8e82446..091ea8c 100644
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml diff --git a/native/pom.xml b/native/pom.xml
index 082f090..8b045e3 100644 index 082f0908..8b045e3b 100644
--- a/native/pom.xml --- a/native/pom.xml
+++ b/native/pom.xml +++ b/native/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -493,7 +493,7 @@ index 082f090..8b045e3 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 8f48538..144e3f1 100644 index 6821d750..3eb013db 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -4,23 +4,24 @@ @@ -4,23 +4,24 @@
@ -588,7 +588,7 @@ index 8f48538..144e3f1 100644
+ +
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.1.12.Final</netty.version> <netty.version>4.1.13.Final</netty.version>
- <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.target>1.7</maven.compiler.target>
+ <!-- Require Java 8 --> + <!-- Require Java 8 -->
@ -683,7 +683,7 @@ index 8f48538..144e3f1 100644
+ </profiles> + </profiles>
</project> </project>
diff --git a/protocol/pom.xml b/protocol/pom.xml diff --git a/protocol/pom.xml b/protocol/pom.xml
index bf4b399..9a4b652 100644 index bf4b399a..9a4b6529 100644
--- a/protocol/pom.xml --- a/protocol/pom.xml
+++ b/protocol/pom.xml +++ b/protocol/pom.xml
@@ -4,24 +4,24 @@ @@ -4,24 +4,24 @@
@ -720,7 +720,7 @@ index bf4b399..9a4b652 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index 1eae873..98656fe 100644 index 1eae8733..98656fed 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -4,18 +4,18 @@ @@ -4,18 +4,18 @@
@ -791,7 +791,7 @@ index 1eae873..98656fe 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/query/pom.xml b/query/pom.xml diff --git a/query/pom.xml b/query/pom.xml
index 9ecb261..4b3613f 100644 index 9ecb2612..4b3613fa 100644
--- a/query/pom.xml --- a/query/pom.xml
+++ b/query/pom.xml +++ b/query/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -832,5 +832,5 @@ index 9ecb261..4b3613f 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.7.4 (Apple Git-66) 2.13.0