Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-06-26 14:35:05 +02:00
Code Issues Projects Releases Wiki Activity

upstream merge 9b3b42316f25a84530e3bbc8b3887ced4ad9838c

Browse Source
This commit is contained in:
Troy Frew 2017-07-04 16:20:09 -04:00
parent 1c98857249
commit 6ab69de258
No known key found for this signature in database
GPG Key ID: 2B07581071A3CA7D
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

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

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

@ -1,4 +1,4 @@
From 8170c6aa72e31d92fda0ea1e2138aee6d9b0ec1c Mon Sep 17 00:00:00 2001
From 6b641ee5ec07671f0ce61e39ecae641d7c2849f4 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
@ -493,7 +493,7 @@ index 082f090..8b045e3 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 5a03519..144e3f1 100644
index 8f48538..144e3f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,23 +4,24 @@
@ -597,14 +597,14 @@ index 5a03519..144e3f1 100644
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -117,36 +142,14 @@
@@ -117,31 +142,14 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.13</version>
- <version>1.15</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
@ -614,15 +614,10 @@ index 5a03519..144e3f1 100644
- </execution>
- </executions>
- <configuration>
- <ignores>
- <ignore>java.lang.ClassLoader</ignore>
- <ignore>java.lang.Throwable</ignore>
- <ignore>java.util.Locale</ignore>
- </ignores>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
- <version>1.1</version>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
@ -637,7 +632,7 @@ index 5a03519..144e3f1 100644
</plugin>
</plugins>
<pluginManagement>
@@ -181,4 +184,49 @@
@@ -176,4 +184,49 @@
</plugins>
</pluginManagement>
</build>