diff --git a/gradle.properties b/gradle.properties index cf904a2c9f..2609019cb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -291,7 +291,7 @@ snappyJavaVersion=1.1.10.7 # Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version springBootVersion=3.4.1 # This usually matches the Spring Framework version dictated by springBootVersion -springVersion=6.2.1 +springVersion=6.2.3 sqliteJdbcVersion=3.48.0.0 diff --git a/server/bootstrap/build.gradle b/server/bootstrap/build.gradle index c5fcb3e8e3..b023f18f86 100644 --- a/server/bootstrap/build.gradle +++ b/server/bootstrap/build.gradle @@ -66,4 +66,4 @@ project.afterEvaluate { } } } -} \ No newline at end of file +} diff --git a/server/embedded/build.gradle b/server/embedded/build.gradle index 943cf6b021..8c01df0a60 100644 --- a/server/embedded/build.gradle +++ b/server/embedded/build.gradle @@ -36,6 +36,9 @@ configurations.configureEach { } dependencies { + // Needed to support composite Log4j2 plugins using JSONLayout elements + implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}" + implementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") { exclude group: "org.springframework.boot", module: "spring-boot-starter-json" // Not used (?) and pulls in an old version of Jackson exclude group: "jakarta.annotation", module: "jakarta.annotation-api" // Already present in tomcat-annotations-api @@ -77,7 +80,10 @@ dependencies { runtimeOnly("org.apache.tomcat:tomcat-dbcp:${apacheTomcatVersion}") { exclude group: "org.apache.tomcat", module: "tomcat-juli" } - runtimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j2Version}" + implementation ("org.apache.logging.log4j:log4j-slf4j2-impl:${log4j2Version}") { + exclude group: 'commons-logging', module: 'commons-logging' + } + implementation "commons-io:commons-io:${commonsIoVersion}" implementation "org.apache.logging.log4j:log4j-core:${log4j2Version}"