Merge branch 'main' into 'renovate-org.apache.logging.log4j-log4j-slf4j-impl-2.x'

# Conflicts: # build.gradle

Merge branch 'main' into 'renovate-org.apache.logging.log4j-log4j-slf4j-impl-2.x'
700b7530 · Griefed · 562da14e · 7325b07c · 700b7530
Commit 700b7530 authored 3 years ago by Griefed
--- a/build.gradle
+++ b/build.gradle
@@ -99,10 +99,10 @@ dependencies {
    embed 'org.apache.logging.log4j:log4j-web:2.17.0'

    embed 'org.apache.logging.log4j:log4j-api:2.17.1'
-    embed 'org.apache.logging.log4j:log4j-core:2.17.0'
    embed 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
+    embed 'org.apache.logging.log4j:log4j-core:2.17.1'
    embed 'org.apache.logging.log4j:log4j-web:2.17.0'
-    embed 'org.apache.logging.log4j:log4j-jul:2.17.0'
+    embed 'org.apache.logging.log4j:log4j-jul:2.17.1'

    // Dev tools
    developmentOnly 'org.springframework.boot:spring-boot-devtools:2.6.2'