Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-16 08:36:35 +02:00
Code Issues Projects Releases Wiki Activity
b3296adf72
Waterfall/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch

35 lines
1.0 KiB
Diff
Raw Normal View History

Updated Upstream (BungeeCord) Upstream has released updates that appears 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: a52ea500 #2769: Guardian target beam lost on server change 17d5dd3f Add dist Maven profile to generate source and Javadoc jars 9e8ab747 Add JsonConfiguration support to bungeecord-config cdacc0b1 #2498: Add ServerConnectRequest accessor in ServerConnectEvent. b4b998b2 #2761: Add ClientConnectEvent
2020-02-10 23:39:19 +01:00
From 8fcf80f3a4a5fd0c9b8d096a996f8e90f803492a 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 appears 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: a52ea500 #2769: Guardian target beam lost on server change 17d5dd3f Add dist Maven profile to generate source and Javadoc jars 9e8ab747 Add JsonConfiguration support to bungeecord-config cdacc0b1 #2498: Add ServerConnectRequest accessor in ServerConnectEvent. b4b998b2 #2761: Add ClientConnectEvent
2020-02-10 23:39:19 +01:00
index 9ac3c1af..1e1df054 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 appears 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: a52ea500 #2769: Guardian target beam lost on server change 17d5dd3f Add dist Maven profile to generate source and Javadoc jars 9e8ab747 Add JsonConfiguration support to bungeecord-config cdacc0b1 #2498: Add ServerConnectRequest accessor in ServerConnectEvent. b4b998b2 #2761: Add ClientConnectEvent
2020-02-10 23:39:19 +01:00
@@ -105,6 +105,20 @@
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>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <!-- Waterfall start - copy license files into jar -->
+ <resource>
+ <directory>../</directory>
+ <includes>
+ <include>LICENSE</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../../</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ <!-- Waterfall end -->
</resources>
</build>
</project>
--
Updated Upstream (BungeeCord) Upstream has released updates that appears 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: a52ea500 #2769: Guardian target beam lost on server change 17d5dd3f Add dist Maven profile to generate source and Javadoc jars 9e8ab747 Add JsonConfiguration support to bungeecord-config cdacc0b1 #2498: Add ServerConnectRequest accessor in ServerConnectEvent. b4b998b2 #2761: Add ClientConnectEvent
2020-02-10 23:39:19 +01:00
2.25.0
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