Don't include log4j

Dieser Commit ist enthalten in:
Riley Park 2021-06-17 18:42:17 -07:00
Ursprung 770bcf35bb
Commit d76f8e018c
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: D831AF236C834E45
4 geänderte Dateien mit 11 neuen und 12 gelöschten Zeilen

Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..ffb7b25b01bc26e3234358e39633c7f7578e018d 100644
index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..f3b51015bcd765e2035e9071fab273903b48abdf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,21 +22,24 @@ repositories {
@@ -22,21 +22,23 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
implementation("jline:jline:2.12.1")
@ -17,7 +17,6 @@ index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..ffb7b25b01bc26e3234358e39633c7f7
- }
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
+ implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
+ implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") // Paper
implementation("org.ow2.asm:asm:9.1")
implementation("com.googlecode.json-simple:json-simple:1.1.1") {
// This includes junit transitively for whatever reason
@ -37,7 +36,7 @@ index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..ffb7b25b01bc26e3234358e39633c7f7
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
}
@@ -55,6 +58,7 @@ tasks.jar {
@@ -55,6 +57,7 @@ tasks.jar {
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
"Specification-Vendor" to "Bukkit Team",
@ -45,7 +44,7 @@ index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..ffb7b25b01bc26e3234358e39633c7f7
)
for (tld in setOf("net", "com", "org")) {
attributes("$tld/bukkit", "Sealed" to true)
@@ -72,11 +76,19 @@ publishing {
@@ -72,11 +75,19 @@ publishing {
}
}

Datei anzeigen

@ -19,7 +19,7 @@ Other changes:
configuration
diff --git a/build.gradle.kts b/build.gradle.kts
index ffb7b25b01bc26e3234358e39633c7f7578e018d..a85b1922391bd9aa121a3654f0095c9523e7fbd7 100644
index f3b51015bcd765e2035e9071fab273903b48abdf..54788e7812f39349aa7b8005feb79d99a59ad95a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,17 @@ repositories {
@ -40,7 +40,7 @@ index ffb7b25b01bc26e3234358e39633c7f7578e018d..a85b1922391bd9aa121a3654f0095c95
+ // Paper end
implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") // Paper
implementation("org.ow2.asm:asm:9.1")
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
new file mode 100644
index 0000000000000000000000000000000000000000..a4070b59e261f0f1ac4beec47b11492f4724bf27
@ -112,7 +112,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 84067073ebb9852fcca0c290b5ca916b099707f1..151d08104ed390905becda5f7ba16c8f933cd3d0 100644
index 3875a2902c6a737fed4e2df3f7aee8fbe6ddda15..cedf31670e65bd7f7ed62e8f622715343348cdf4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -12,6 +12,7 @@ import com.mojang.datafixers.DataFixer;

Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
diff --git a/build.gradle.kts b/build.gradle.kts
index 55915452beff1f8b6b9a44cf2a6d208dda6c3d8d..ff26c51fe2a04bd8a18a9c4ee9ca004f32fae4ab 100644
index 864fab686595f0efe3ff8b097339bcaff95fcc48..5c92ed82d1527d1631fdb4917cd0e0d56f907a96 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,6 +42,7 @@ dependencies {
@@ -41,6 +41,7 @@ dependencies {
}
runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper

Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/build.gradle.kts b/build.gradle.kts
index c4aac1360a7fce1ae95fa52ecb8a861a1c196edb..f83c5c672d7728946d4c4aef6c496a73da41fc61 100644
index f42b0889a4ea1a7b2413c0f5399f043d7f243633..76e93c6a46286b8c035315f31828e0d2db9504f7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -52,6 +52,7 @@ dependencies {
@@ -51,6 +51,7 @@ dependencies {
implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
implementation("io.netty:netty-all:4.1.65.Final") // Paper