diff --git a/leaf-server/build.gradle.kts.patch b/leaf-server/build.gradle.kts.patch index 50192313..4e9f89c1 100644 --- a/leaf-server/build.gradle.kts.patch +++ b/leaf-server/build.gradle.kts.patch @@ -110,11 +110,12 @@ } - implementation("io.netty:netty-codec-haproxy:4.1.115.Final") // Add support for proxy protocol - implementation("org.apache.logging.log4j:log4j-iostreams:2.24.1") +- implementation("org.ow2.asm:asm-commons:9.7.1") + // Leaf start - Bump Dependencies -+ implementation("io.netty:netty-codec-haproxy:4.1.119.Final") // Add support for proxy protocol ++ implementation("io.netty:netty-codec-haproxy:4.1.127.Final") // Add support for proxy protocol + implementation("org.apache.logging.log4j:log4j-iostreams:2.24.3") + // Leaf end - Bump Dependencies - implementation("org.ow2.asm:asm-commons:9.7.1") ++ implementation("org.ow2.asm:asm-commons:9.8") // Leaf - Bump Dependencies implementation("org.spongepowered:configurate-yaml:4.2.0-20250225.064233-199") implementation("org.spongepowered:configurate-core:4.2.0-20250225.064233-204") // Pinned dependency of above pinned yaml snapshot. implementation("commons-lang:commons-lang:2.6") @@ -132,6 +133,8 @@ - testImplementation("org.hamcrest:hamcrest:2.2") - testImplementation("org.mockito:mockito-core:5.14.1") - mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions +- testImplementation("org.ow2.asm:asm-tree:9.7.1") +- testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // CartesianTest + runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0") // Leaf - Bump Dependencies + runtimeOnly("com.mysql:mysql-connector-j:9.2.0") { + exclude("com.google.protobuf", "protobuf-java") // Leaf - Exclude outdated protobuf version @@ -158,8 +161,7 @@ + testImplementation("org.hamcrest:hamcrest:3.0") + testImplementation("org.mockito:mockito-core:5.16.1") + mockitoAgent("org.mockito:mockito-core:5.16.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions - testImplementation("org.ow2.asm:asm-tree:9.7.1") -- testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // CartesianTest ++ testImplementation("org.ow2.asm:asm-tree:9.8") + testImplementation("org.junit-pioneer:junit-pioneer:2.3.0") // CartesianTest + // Leaf end - Bump Dependencies @@ -173,10 +175,10 @@ // Spark - implementation("me.lucko:spark-api:0.1-20240720.200737-2") - implementation("me.lucko:spark-paper:1.10.119-20241121.092015-1") -+ implementation("me.lucko:spark-api:0.1-dev-f0b5206-SNAPSHOT") -+ implementation("me.lucko:spark-paper:1.10-dev-f0b5206-SNAPSHOT") ++ implementation("me.lucko:spark-api:0.1-dev-462d7f8-SNAPSHOT") ++ implementation("me.lucko:spark-paper:1.10-dev-462d7f8-SNAPSHOT") + -+ implementation("io.netty:netty-all:4.1.119.Final") // Dreeam TODO - Update to 4.2.0 ++ implementation("io.netty:netty-all:4.1.127.Final") // Dreeam TODO - Update to 4.2.0 + // Leaf end - Bump Dependencies }