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

Fix compile and move version changes out of the wrong patch

Browse Source
This commit is contained in:
Shane Freeder 2020-07-14 12:13:51 +01:00
parent 7737b0ff0a
commit 7ddd12de76
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 9731202a6ca2a028280fd53ce41faedd712fcee3 Mon Sep 17 00:00:00 2001 From 01d375838823addacb356489795bf886c31565f3 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200 Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 15a829b6..9c1ec374 100644 index 3f3aaef4..3730c14c 100644
--- a/bootstrap/pom.xml --- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml +++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@ @@ -49,6 +49,9 @@
@ -39,7 +39,7 @@ index 15a829b6..9c1ec374 100644
</build> </build>
diff --git a/log4j/pom.xml b/log4j/pom.xml diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644 new file mode 100644
index 00000000..a044119e index 00000000..5fbc5af6
--- /dev/null --- /dev/null
+++ b/log4j/pom.xml +++ b/log4j/pom.xml
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
@ -50,13 +50,13 @@ index 00000000..a044119e
+ <parent> + <parent>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
+ <version>1.15-SNAPSHOT</version> + <version>1.16-R0.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath>
+ </parent> + </parent>
+ +
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log4j</artifactId> + <artifactId>waterfall-log4j</artifactId>
+ <version>1.15-SNAPSHOT</version> + <version>1.16-R0.3-SNAPSHOT</version>
+ <packaging>jar</packaging> + <packaging>jar</packaging>
+ +
+ <name>Waterfall-Log</name> + <name>Waterfall-Log</name>
@ -233,7 +233,7 @@ index 00000000..93ce3b14
+ </Loggers> + </Loggers>
+</Configuration> +</Configuration>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index ada53ad1..5b283b4b 100644 index c5b8e7f3..97908819 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
@ -245,7 +245,7 @@ index ada53ad1..5b283b4b 100644
<module>protocol</module> <module>protocol</module>
<module>proxy</module> <module>proxy</module>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index f94c54ca..4c61d336 100644 index d52692f2..fca4d609 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@

22
BungeeCord-Patches/0056-Remove-version-from-brand-info.patch
View File

@ -1,29 +1,9 @@
From 413f60fafa3c105ae898014264339fed19c3535f Mon Sep 17 00:00:00 2001 From 7d0ff3686f968b5124d2c0f2ad0dda5f10f9dc20 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 20 Jun 2020 18:21:17 +0100 Date: Sat, 20 Jun 2020 18:21:17 +0100
Subject: [PATCH] Remove version from brand info Subject: [PATCH] Remove version from brand info
diff --git a/log4j/pom.xml b/log4j/pom.xml
index f5267567..2229d347 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-parent</artifactId>
- <version>1.15-SNAPSHOT</version>
+ <version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-log4j</artifactId>
- <version>1.15-SNAPSHOT</version>
+ <version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Waterfall-Log</name>
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index acedbefe..8c7e3ab8 100644 index acedbefe..8c7e3ab8 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java