Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-16 07:15:14 +01:00
Code Issues Projects Releases Wiki Activity
f26b0ffb69
Waterfall/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch

41 lines
1.1 KiB
Diff
Raw Normal View History

Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 78ca16df Minecraft 1.19.1 support adc32d5a #3367: Add linux aarch64 native epoll support 12e45148 #3355,#3357: Fix possible NPE's in LoginEvent & PreLoginEvent
2022-07-27 20:35:10 +02:00
From b526187ee2b182930850ced2708a2770b669c949 Mon Sep 17 00:00:00 2001
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 18 Jul 2018 20:23:03 +0300
Subject: [PATCH] Copy license files into jar
diff --git a/proxy/pom.xml b/proxy/pom.xml
Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 78ca16df Minecraft 1.19.1 support adc32d5a #3367: Add linux aarch64 native epoll support 12e45148 #3355,#3357: Fix possible NPE's in LoginEvent & PreLoginEvent
2022-07-27 20:35:10 +02:00
index cf0a6a99..1d370c70 100644
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 78ca16df Minecraft 1.19.1 support adc32d5a #3367: Add linux aarch64 native epoll support 12e45148 #3355,#3357: Fix possible NPE's in LoginEvent & PreLoginEvent
2022-07-27 20:35:10 +02:00
@@ -124,4 +124,26 @@
Updated Upstream (BungeeCord) (#741)
2022-06-07 19:12:20 +02:00
<scope>runtime</scope>
</dependency>
</dependencies>
+
+ <!-- Waterfall start - copy license files into jar -->
+ <build>
+ <resources>
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
+ <resource>
Fix crash on startup (#743)
2022-06-07 19:44:58 +02:00
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
+ <directory>../</directory>
+ <includes>
+ <include>LICENSE</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../../</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
Updated Upstream (BungeeCord) (#741)
2022-06-07 19:12:20 +02:00
+ </resources>
+ </build>
+ <!-- Waterfall end -->
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
</project>
--
Updated Upstream (BungeeCord) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 78ca16df Minecraft 1.19.1 support adc32d5a #3367: Add linux aarch64 native epoll support 12e45148 #3355,#3357: Fix possible NPE's in LoginEvent & PreLoginEvent
2022-07-27 20:35:10 +02:00
2.37.1
Copy license files into jar Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.
2018-07-18 19:46:20 +02:00
Reference in New Issue Copy Permalink