Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-23 16:11:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix some build issues

Browse Source
This commit is contained in:
Shane Freeder 2023-06-07 20:35:05 +01:00
parent 813d54bc71
commit 0c3f9bd6b4
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 0bab19d41f1f1062e6d8232d05255e0e16ce355a Mon Sep 17 00:00:00 2001 From 715a97765977742a004bad83b5eaf8105fc48b14 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200 Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -506,7 +506,7 @@ index c7478c96..e137dfcc 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index c118aa69..432fd5c5 100644 index c118aa69..5fff5a09 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -3,18 +3,25 @@ @@ -3,18 +3,25 @@
@ -615,7 +615,7 @@ index c118aa69..432fd5c5 100644
</plugin> </plugin>
<plugin> <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId> + <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version> + <version>3.5.0</version>
+ <configuration> + <configuration>
+ <doclint>none</doclint> + <doclint>none</doclint>
+ </configuration> + </configuration>
@ -671,7 +671,7 @@ index c118aa69..432fd5c5 100644
+ <plugin> + <plugin>
+ <groupId>org.apache.maven.plugins</groupId> + <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId> + <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.0</version> + <version>3.5.0</version>
+ <configuration> + <configuration>
+ <doclint>none</doclint> + <doclint>none</doclint>
+ </configuration> + </configuration>
@ -884,5 +884,5 @@ index 90a4c8d5..81af5457 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.40.1.windows.1 2.40.1

16
BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 43de49256f52a8990a41b6194163023d1e169f3d Mon Sep 17 00:00:00 2001 From ae6d9010ecdfd204ce171afea813452392a5c647 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
@ -39,7 +39,7 @@ index 5ec5faf7..f9ec2c1c 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..9c561bcc index 00000000..1ef8c1f9
--- /dev/null --- /dev/null
+++ b/log4j/pom.xml +++ b/log4j/pom.xml
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
@ -59,7 +59,7 @@ index 00000000..9c561bcc
+ <version>1.19-R0.1-SNAPSHOT</version> + <version>1.19-R0.1-SNAPSHOT</version>
+ <packaging>jar</packaging> + <packaging>jar</packaging>
+ +
+ <name>Waterfall-Log</name> + <name>Waterfall-Log4J</name>
+ <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description> + <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
+ +
+ <properties> + <properties>
@ -233,13 +233,15 @@ index 00000000..cfd039cd
+ </Loggers> + </Loggers>
+</Configuration> +</Configuration>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 432fd5c5..77991d81 100644 index 5fff5a09..6d3fedae 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -56,11 +56,12 @@ @@ -55,12 +55,13 @@
<module>chat</module>
<module>config</module> <module>config</module>
<module>event</module> <module>event</module>
<module>log</module> - <module>log</module>
+ <!--<module>log</module>-->
+ <module>log4j</module> + <module>log4j</module>
<module>module</module> <module>module</module>
<module>protocol</module> <module>protocol</module>
@ -1627,5 +1629,5 @@ index 21a48df6..00000000
- -
-} -}
-- --
2.40.1.windows.1 2.40.1