From fcd0701a5bde5d1ef6212baf90fda94321f804ff Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Wed, 24 Jan 2024 20:06:32 +0200 Subject: [PATCH] Upgrade Log4J version used by AT tool --- gradle/runtime.libs.versions.toml | 2 ++ .../accesstransformer/AccessTransformerJarProcessor.java | 1 + 2 files changed, 3 insertions(+) diff --git a/gradle/runtime.libs.versions.toml b/gradle/runtime.libs.versions.toml index 139b0444a..4f746c174 100644 --- a/gradle/runtime.libs.versions.toml +++ b/gradle/runtime.libs.versions.toml @@ -19,6 +19,7 @@ access-transformers-new = "8.0.5" unprotect = "1.2.0" asm = "9.3" union-relauncher = "1.0.0" +access-transformers-log4j = "2.17.1" [libraries] # Decompilers @@ -43,3 +44,4 @@ access-transformers-new = { module = "net.minecraftforge:accesstransformers", ve unprotect = { module = "io.github.juuxel:unprotect", version.ref = "unprotect" } asm = { module = "org.ow2.asm:asm", version.ref = "asm" } union-relauncher = { module = "io.github.juuxel:union-relauncher", version.ref = "union-relauncher" } +access-transformers-log4j-bom = { module = "org.apache.logging.log4j:log4j-bom", version.ref = "access-transformers-log4j" } diff --git a/src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerJarProcessor.java b/src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerJarProcessor.java index 52528301f..f7bbcc59c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerJarProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerJarProcessor.java @@ -161,6 +161,7 @@ public static void executeAt(Project project, Path input, Path output, AccessTra FileCollection classpath = new DependencyDownloader(project) .add((serverBundleMetadataPresent ? LoomVersions.ACCESS_TRANSFORMERS_NEW : LoomVersions.ACCESS_TRANSFORMERS).mavenNotation()) .add(LoomVersions.ASM.mavenNotation()) + .platform(LoomVersions.ACCESS_TRANSFORMERS_LOG4J_BOM.mavenNotation()) .download(); List args = new ArrayList<>(); args.add("--inJar");