Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

Bump denpendencies

Browse Source
This commit is contained in:
Dreeam
2023-06-21 23:30:01 +08:00
parent c8884b36b5
commit f2e50260fd
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/api/0004-Bump-Dependencies.patch
View File

@@ -5,9 +5,20 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index 58bae199b8fcdfcc40a159748e723d7d163515a5..4df816e7ffff8f47a9d4fabce12b021b950f3e9f 100644
index 58bae199b8fcdfcc40a159748e723d7d163515a5..e9712e908567eda14f5dc09a42aa39e700f6b814 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,8 @@ java {
}
val adventureVersion = "4.14.0"
-val slf4jVersion = "1.8.0-beta4"
-val log4jVersion = "2.17.1"
+val slf4jVersion = "2.0.7" // Leaf - Bump Dependencies
+val log4jVersion = "2.20.0" // Leaf - Bump Dependencies
val apiAndDocs: Configuration by configurations.creating {
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -27,16 +27,16 @@ val annotationsVersion = "24.0.1"
dependencies {
@@ -45,8 +56,8 @@ index 58bae199b8fcdfcc40a159748e723d7d163515a5..4df816e7ffff8f47a9d4fabce12b021b
- 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.2")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.12")
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.12")
+ compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper
val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
@@ -60,7 +71,7 @@ index 58bae199b8fcdfcc40a159748e723d7d163515a5..4df816e7ffff8f47a9d4fabce12b021b
testCompileOnly(checkerQual)
// Paper end
- testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito
+ testImplementation("org.mockito:mockito-core:5.3.1") // Paper - add mockito
+ testImplementation("org.mockito:mockito-core:5.4.0") // Paper - add mockito
testImplementation("org.apache.commons:commons-lang3:3.12.0")
- testImplementation("junit:junit:4.13.2")

24
patches/server/0010-Bump-Dependencies.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index 476e5829b2b0e2782f11b258befc7d5002683789..7a2bbf13ab6cc23849f733063f00797b7659ede9 100644
index 476e5829b2b0e2782f11b258befc7d5002683789..e16422d4d255aa7a2aff88e090e2d314e119860a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
@@ -27,7 +27,7 @@ index 476e5829b2b0e2782f11b258befc7d5002683789..7a2bbf13ab6cc23849f733063f00797b
+ // Leaf start - Bump Dependencies
+ implementation("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - implementation
+ annotationProcessor("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - Needed to generate meta for our Log4j plugins
+ implementation("io.netty:netty-codec-haproxy:4.1.93.Final") // Paper - Add support for proxy protocol
+ implementation("io.netty:netty-codec-haproxy:4.1.94.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")
@@ -37,7 +37,7 @@ index 476e5829b2b0e2782f11b258befc7d5002683789..7a2bbf13ab6cc23849f733063f00797b
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.20.0") // Paper - remove exclusion
+ implementation("org.ow2.asm:asm:9.5")
+ implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
+ testImplementation("org.mockito:mockito-core:5.3.1") // Paper - switch to mockito
+ testImplementation("org.mockito:mockito-core:5.4.0") // Paper - switch to mockito
+ implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
+ // Leaf end
implementation("commons-lang:commons-lang:2.6")
@@ -52,19 +52,31 @@ index 476e5829b2b0e2782f11b258befc7d5002683789..7a2bbf13ab6cc23849f733063f00797b
isTransitive = false
}
// Paper end
@@ -51,8 +53,8 @@ dependencies {
implementation("dev.omega24:upnp4j:1.0") // Purpur
runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.12") // Leaf - Bump Dependencies
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.12") // Leaf - Bump Dependencies
// Pufferfish start
implementation("org.yaml:snakeyaml:2.0")
@@ -61,11 +63,13 @@ dependencies {
}
// Pufferfish end
- testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
- testImplementation("junit:junit:4.13.2")
- testImplementation("org.hamcrest:hamcrest-library:1.3")
+ // Leaf start - Bump Dependencies
+ testImplementation("io.github.classgraph:classgraph:4.8.160") // Paper - mob goal test
testImplementation("junit:junit:4.13.2")
- testImplementation("org.hamcrest:hamcrest-library:1.3")
+ testImplementation("junit:junit:4.13.2") // Leaf TODO - update to 5?
+ 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.93.Final"); // Paper - Bump netty
+ implementation("io.netty:netty-all:4.1.94.Final"); // Paper - Bump netty
+ // Leaf end
}