diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index b19b48bb..fb439513 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -3,7 +3,7 @@ From: Github Actions Date: Fri, 16 Jun 2023 05:21:52 +0000 Subject: [PATCH] Purpur API Changes -Commit: 41ab912b5bcccecb3e8a85124369006bd673b718 +Commit: a2e96448a0e4688585b5e7dee39caa90bfe48cdb Patches below are removed in this patch: Build-System-Changes.patch diff --git a/patches/api/0004-Bump-Dependencies.patch b/patches/api/0004-Bump-Dependencies.patch index a20d2f67..ba4444e6 100644 --- a/patches/api/0004-Bump-Dependencies.patch +++ b/patches/api/0004-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index b9fe57f709de6dc262295a0a0134c371ddd69baa..81f1a546264e4a9b09896ababfbf7090333894f2 100644 +index b9fe57f709de6dc262295a0a0134c371ddd69baa..60483485ac6217d44a289cdbf4be53f01c62f445 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,8 @@ java { @@ -26,10 +26,11 @@ index b9fe57f709de6dc262295a0a0134c371ddd69baa..81f1a546264e4a9b09896ababfbf7090 - api("com.google.guava:guava:31.1-jre") - api("com.google.code.gson:gson:2.10") - api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.9") // Paper -+ api("com.google.guava:guava:32.1.1-jre") // Leaf - Bump Dependencies +- api("org.yaml:snakeyaml:2.0") ++ api("com.google.guava:guava:32.1.2-jre") // Leaf - Bump Dependencies + api("com.google.code.gson:gson:2.10.1") + api("net.md-5:bungeecord-chat:1.20-R0.1-SNAPSHOT") // Paper // Leaf - Bump Dependencies - api("org.yaml:snakeyaml:2.0") ++ api("org.yaml:snakeyaml:2.1") // Leaf - Bump Dependencies api("org.joml:joml:1.10.5") // Paper start api("com.googlecode.json-simple:json-simple:1.1.1") { @@ -55,9 +56,9 @@ index b9fe57f709de6dc262295a0a0134c371ddd69baa..81f1a546264e4a9b09896ababfbf7090 - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") - compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper -+ api("org.apache.maven:maven-resolver-provider:3.9.3") -+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.13") -+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.13") ++ api("org.apache.maven:maven-resolver-provider:3.9.4") ++ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15") ++ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.15") + compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations... @@ -66,14 +67,15 @@ index b9fe57f709de6dc262295a0a0134c371ddd69baa..81f1a546264e4a9b09896ababfbf7090 // Paper start - add checker - val checkerQual = "org.checkerframework:checker-qual:3.21.0" -+ val checkerQual = "org.checkerframework:checker-qual:3.36.0" ++ val checkerQual = "org.checkerframework:checker-qual:3.37.0" compileOnlyApi(checkerQual) testCompileOnly(checkerQual) // Paper end - testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito + testImplementation("org.mockito:mockito-core:5.4.0") // Paper - add mockito - testImplementation("org.apache.commons:commons-lang3:3.12.0") +- testImplementation("org.apache.commons:commons-lang3:3.12.0") ++ testImplementation("org.apache.commons:commons-lang3:3.13.0") testImplementation("junit:junit:4.13.2") - testImplementation("org.hamcrest:hamcrest-library:1.3") + @@ -83,15 +85,17 @@ index b9fe57f709de6dc262295a0a0134c371ddd69baa..81f1a546264e4a9b09896ababfbf7090 } configure { -@@ -116,7 +119,7 @@ tasks.withType { +@@ -116,8 +119,8 @@ tasks.withType { options.use() options.isDocFilesSubDirs = true options.links( - "https://guava.dev/releases/31.1-jre/api/docs/", -+ "https://guava.dev/releases/32.1.1-jre/api/docs/", // Leaf - Bump Dependencies - "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", +- "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", ++ "https://guava.dev/releases/32.1.2-jre/api/docs/", // Leaf - Bump Dependencies ++ "https://javadoc.io/doc/org.yaml/snakeyaml/2.1/", // Leaf - Bump Dependencies "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations // Paper start + //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat @@ -161,6 +164,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks. jarToScan.set(tasks.jar.flatMap { it.archiveFile }) classpath.from(configurations.compileClasspath) diff --git a/patches/server/0002-Leaf-Config.patch b/patches/server/0002-Leaf-Config.patch index 8323114a..7203a6b9 100644 --- a/patches/server/0002-Leaf-Config.patch +++ b/patches/server/0002-Leaf-Config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaf Config diff --git a/build.gradle.kts b/build.gradle.kts -index 43a72d2fb4b6e73fa258c414eaada65ac366d1e3..84a499e4f7daed0a40e3c1f30ba2be1469596c8c 100644 +index 43a72d2fb4b6e73fa258c414eaada65ac366d1e3..add4506180ce44167584e228142bfc0b0f8d6155 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,6 +58,13 @@ dependencies { @@ -13,7 +13,7 @@ index 43a72d2fb4b6e73fa258c414eaada65ac366d1e3..84a499e4f7daed0a40e3c1f30ba2be14 runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + // Pufferfish start -+ implementation("org.yaml:snakeyaml:2.0") ++ implementation("org.yaml:snakeyaml:2.1") + implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4") { + exclude(group = "org.yaml", module = "snakeyaml") + } diff --git a/patches/server/0009-Purpur-Base.patch b/patches/server/0009-Purpur-Base.patch index 0730433b..dbe39a0c 100644 --- a/patches/server/0009-Purpur-Base.patch +++ b/patches/server/0009-Purpur-Base.patch @@ -3,13 +3,13 @@ From: Github Actions Date: Wed, 24 May 2023 06:00:03 +0800 Subject: [PATCH] Purpur Base -Commit: 41ab912b5bcccecb3e8a85124369006bd673b718 +Commit: a2e96448a0e4688585b5e7dee39caa90bfe48cdb Original license: MIT Original project: https://github.com/PurpurMC/Purpur diff --git a/build.gradle.kts b/build.gradle.kts -index 84a499e4f7daed0a40e3c1f30ba2be1469596c8c..faad0e4195d43cb28631722b3a2e29787d2f3b57 100644 +index add4506180ce44167584e228142bfc0b0f8d6155..7adfdc672b6a300d67efc5d8825951aab95c693e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,6 +54,10 @@ dependencies { diff --git a/patches/server/0010-Purpur-Server-Changes.patch b/patches/server/0010-Purpur-Server-Changes.patch index 8efa3138..0bf118d6 100644 --- a/patches/server/0010-Purpur-Server-Changes.patch +++ b/patches/server/0010-Purpur-Server-Changes.patch @@ -3,7 +3,7 @@ From: Github Actions Date: Fri, 16 Jun 2023 05:22:02 +0000 Subject: [PATCH] Purpur Server Changes -Commit: 41ab912b5bcccecb3e8a85124369006bd673b718 +Commit: a2e96448a0e4688585b5e7dee39caa90bfe48cdb Patches below are removed in this patch: MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch diff --git a/patches/server/0012-Bump-Dependencies.patch b/patches/server/0012-Bump-Dependencies.patch index a4985c6f..355bd631 100644 --- a/patches/server/0012-Bump-Dependencies.patch +++ b/patches/server/0012-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index faad0e4195d43cb28631722b3a2e29787d2f3b57..5ab821c9efd5d4d168e28897222b5d5d27aab2da 100644 +index 7adfdc672b6a300d67efc5d8825951aab95c693e..8cdacc649a1ae35b147126c0c3ad633784d50aa5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { @@ -29,7 +29,7 @@ index faad0e4195d43cb28631722b3a2e29787d2f3b57..5ab821c9efd5d4d168e28897222b5d5d runtimeOnly(log4jPlugins.output) alsoShade(log4jPlugins.output) - implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol -+ implementation("io.netty:netty-codec-haproxy:4.1.95.Final") // Paper - Add support for proxy protocol ++ implementation("io.netty:netty-codec-haproxy:4.1.96.Final") // Paper - Add support for proxy protocol // Paper end - implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion - implementation("org.ow2.asm:asm:9.4") @@ -44,9 +44,10 @@ index faad0e4195d43cb28631722b3a2e29787d2f3b57..5ab821c9efd5d4d168e28897222b5d5d + // Leaf end implementation("commons-lang:commons-lang:2.6") - implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation -+ implementation("net.fabricmc:mapping-io:0.4.2") // Paper - needed to read mappings for stacktrace deobfuscation // Leaf - Bump Dependencies - runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") +- runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") - runtimeOnly("com.mysql:mysql-connector-j:8.0.33") ++ implementation("net.fabricmc:mapping-io:0.4.2") // Paper - needed to read mappings for stacktrace deobfuscation // Leaf - Bump Dependencies ++ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1-SNAPSHOT") + runtimeOnly("com.mysql:mysql-connector-j:8.1.0") // Leaf - Bump Dependencies runtimeOnly("com.lmax:disruptor:3.4.4") // Paper // Paper start - Use Velocity cipher @@ -63,26 +64,26 @@ index faad0e4195d43cb28631722b3a2e29787d2f3b57..5ab821c9efd5d4d168e28897222b5d5d - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + // Leaf start - Bump Dependencies -+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.3") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.13") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.13") ++ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.4") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.15") + // Leaf end // Pufferfish start - implementation("org.yaml:snakeyaml:2.0") + implementation("org.yaml:snakeyaml:2.1") @@ -69,11 +73,13 @@ dependencies { } // Pufferfish end - testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test + // Leaf start - Bump Dependencies -+ testImplementation("io.github.classgraph:classgraph:4.8.161") // Paper - mob goal test ++ testImplementation("io.github.classgraph:classgraph:4.8.162") // Paper - mob goal test testImplementation("junit:junit:4.13.2") - testImplementation("org.hamcrest:hamcrest-library:1.3") + testImplementation("org.hamcrest:hamcrest:2.2") - implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty -+ implementation("io.netty:netty-all:4.1.95.Final"); // Paper - Bump netty ++ implementation("io.netty:netty-all:4.1.96.Final"); // Paper - Bump netty + // Leaf end }