1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
From b12cef9556678f14d349af0b8b8a2c520b5d0e94 Mon Sep 17 00:00:00 2001
From: sulu5890 <sulu@sulu.me>
Date: Fri, 17 Dec 2021 13:36:28 -0600
Subject: [PATCH] update log4j
diff --git a/pom.xml b/pom.xml
index d751230b..3958ba7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.8.1</version>
+ <version>2.17.0</version> <!-- Paper - update log4j -->
<scope>compile</scope>
</dependency>
<dependency>
@@ -55,7 +55,7 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>2.12</version>
+ <version>2.12.1</version> <!-- Paper - update log4j -->
<scope>compile</scope>
</dependency>
<dependency>
@@ -99,8 +99,8 @@
<!-- required until fixed plexus-compiler-eclipse is deployed -->
<pluginRepositories>
<pluginRepository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+ <id>papermc</id> <!-- Paper - update log4j -->
+ <url>https://papermc.io/repo/repository/maven-public/</url> <!-- Paper - update log4j -->
</pluginRepository>
</pluginRepositories>
@@ -141,6 +141,7 @@
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
<Specification-Vendor>Bukkit Team</Specification-Vendor>
+ <Multi-Release>true</Multi-Release> <!-- Paper - update log4j -->
</manifestEntries>
<manifestSections>
<manifestSection>
@@ -168,7 +169,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
+ <version>3.2.4</version> <!-- Paper - update log4j -->
<executions>
<execution>
<phase>package</phase>
@@ -176,6 +177,16 @@
<goal>shade</goal>
</goals>
<configuration>
+ <!-- Paper start - update log4j -->
+ <filters>
+ <filter>
+ <artifact>org.spigotmc:minecraft-server:**</artifact>
+ <excludes>
+ <exclude>org/apache/logging/log4j/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <!-- Paper end - update log4j -->
<createDependencyReducedPom>false</createDependencyReducedPom> <!-- Paper -->
<relocations>
<!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 -->
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 0452fbc0..63cb069f 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -3,10 +3,10 @@
<Appenders>
<Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
<Queue name="TerminalConsole">
- <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
+ <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" /> <!-- Paper - update log4j -->
</Queue>
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
- <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
+ <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" /> <!-- Paper - update log4j -->
<Policies>
<TimeBasedTriggeringPolicy />
<OnStartupTriggeringPolicy />
--
2.34.1
|
