Skip to content

Update to log4j 2.15.0 #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
electronicboy merged 2 commits into from
Dec 10, 2021
Merged

Update to log4j 2.15.0 #714

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8467f90
Update to log4j 2.15.0
Chew Dec 10, 2021
e0baae3
Update to log4j 2.15.0
Chew Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a9a135afeafbb77749b3799d422ff956c0ae9161 Mon Sep 17 00:00:00 2001
From 5da42b118748243d7531199cdca0dfdfc9faac1b Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
Expand Down Expand Up @@ -39,10 +39,10 @@ index b3a70840..00ce099c 100644
</build>
diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644
index 00000000..be4d2484
index 00000000..2059f841
--- /dev/null
+++ b/log4j/pom.xml
@@ -0,0 +1,55 @@
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
Expand All @@ -63,7 +63,7 @@ index 00000000..be4d2484
+ <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
+
+ <properties>
+ <log4j2.version>2.15.0-SNAPSHOT</log4j2.version>
+ <log4j2.version>2.15.0</log4j2.version>
+ </properties>
+
+ <dependencies>
Expand All @@ -90,13 +90,6 @@ index 00000000..be4d2484
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>apache-snapshots</id>
+ <url>https://repository.apache.org/content/groups/snapshots/</url>
+ </repository>
+ </repositories>
+</project>
diff --git a/log4j/src/main/java/io/github/waterfallmc/waterfall/log4j/Log4JLogHandler.java b/log4j/src/main/java/io/github/waterfallmc/waterfall/log4j/Log4JLogHandler.java
new file mode 100644
Expand Down