Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
101 Zeilen
4.8 KiB
Diff
101 Zeilen
4.8 KiB
Diff
From 1dfb687b8c1aa89424bfc697e6d85d0bef99d006 Mon Sep 17 00:00:00 2001
|
|
From: sulu5890 <sulu@sulu.me>
|
|
Date: Sat, 11 Dec 2021 12:27:27 -0600
|
|
Subject: [PATCH] Update Log4j
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index beda5dc8a..668f8646f 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -60,25 +60,25 @@
|
|
<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>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-slf4j-impl</artifactId>
|
|
- <version>2.8.1</version>
|
|
+ <version>2.17.0</version> <!-- Paper - Update Log4j -->
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-iostreams</artifactId>
|
|
- <version>2.8.1</version>
|
|
+ <version>2.17.0</version> <!-- Paper - Update Log4j -->
|
|
</dependency>
|
|
<!-- Paper - Async loggers -->
|
|
<dependency>
|
|
<groupId>com.lmax</groupId>
|
|
<artifactId>disruptor</artifactId>
|
|
- <version>3.4.2</version>
|
|
+ <version>3.4.4</version> <!-- Paper - Update Log4j -->
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
<dependency>
|
|
@@ -179,6 +179,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>
|
|
@@ -206,7 +207,7 @@
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-shade-plugin</artifactId>
|
|
- <version>3.1.1</version>
|
|
+ <version>3.2.4</version> <!-- Paper - Update Log4j -->
|
|
<executions>
|
|
<execution>
|
|
<phase>package</phase>
|
|
@@ -215,6 +216,16 @@
|
|
</goals>
|
|
<configuration>
|
|
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
|
|
+ <!-- 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 -->
|
|
<createSourcesJar>${shadeSourcesJar}</createSourcesJar>
|
|
<relocations>
|
|
<!-- Cannot be relocated as it breaks translation property keys -->
|
|
@@ -265,16 +276,18 @@
|
|
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
|
<resource>META-INF/services/java.sql.Driver</resource>
|
|
</transformer>
|
|
- <transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer" />
|
|
+ <transformer implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer" /> <!-- Paper - Update Log4j -->
|
|
</transformers>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
<dependencies>
|
|
<dependency>
|
|
- <groupId>com.github.edwgiz</groupId>
|
|
- <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
|
|
- <version>2.8.1</version>
|
|
+ <!-- paper start - update log4j -->
|
|
+ <groupId>io.github.edwgiz</groupId>
|
|
+ <artifactId>log4j-maven-shade-plugin-extensions</artifactId>
|
|
+ <version>2.17.0</version>
|
|
+ <!-- paper end - update log4j -->
|
|
</dependency>
|
|
</dependencies>
|
|
</plugin>
|
|
--
|
|
2.34.1
|
|
|