Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ configure(javaProjects) {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

ext['log4j2.version'] = '2.25.4'

dependencyManagement {
imports {
mavenBom("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
Expand Down Expand Up @@ -229,18 +231,7 @@ configure(javaProjects) {
entry("aws-java-sdk-s3")
}

// currently imported BOM spring-boot-dependencies:2.5.12 includes log4j-bom:2.17.2 and
// importing a module log4j-spring-boot:2.17.2 results in its transitive Junit dependencies
// being put into compileClasspath so we have to exclude them here so they are not shipped with PXF
// this is fixed in log4j-spring-boot:2.19.0, which is used by spring-boot-dependencies:3.0.0+
// so when we upgrade to Spring Boot version 3.0.0+ we should remove this fix
// alternatively we can bump log4j-spring-boot to 2.19.0 and not use excludes
// dependency("org.apache.logging.log4j:log4j-spring-boot:2.19.0")
dependency("org.apache.logging.log4j:log4j-spring-boot:2.17.2") {
exclude("org.junit.vintage:junit-vintage-engine")
exclude("org.junit.jupiter:junit-jupiter-engine")
exclude("org.junit.jupiter:junit-jupiter-api")
}
dependency("org.apache.logging.log4j:log4j-spring-boot:2.25.4")

}
}
Expand Down
1 change: 1 addition & 0 deletions server/pxf-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies {
implementation("commons-codec:commons-codec")
implementation("commons-collections:commons-collections")
implementation("commons-lang:commons-lang")
implementation("commons-logging:commons-logging")
implementation("org.springframework.boot:spring-boot-starter-log4j2")
implementation("org.apache.logging.log4j:log4j-spring-boot")
implementation('org.springframework.boot:spring-boot-starter-actuator')
Expand Down
Loading