Skip to content

Commit

Permalink
Correct log4j dependencies (#3080)
Browse files Browse the repository at this point in the history
Motivation:

1. `servicetalk-http-netty-test-fixtures` do not depend on `log4j`,
`log4j-slf4j-impl` can be safely removed.
2. `servicetalk-opentracing-http` uses `log4j-core` as
`testImplementation` dependency. Therefore, `log4j-bom` have to move
from `testRuntimeOnly` to `testImplementation` scope.
  • Loading branch information
idelpivnitskiy authored Oct 15, 2024
1 parent fe7739e commit 412460f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion servicetalk-http-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ dependencies {
testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version"
testFixturesImplementation "org.slf4j:slf4j-api:$slf4jVersion"
testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
}

// We need testng for the reactive-streams-tck
Expand Down
2 changes: 1 addition & 1 deletion servicetalk-opentracing-http/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies {
implementation project(":servicetalk-opentracing-internal")
implementation "org.slf4j:slf4j-api:$slf4jVersion"

testImplementation enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
testImplementation testFixtures(project(":servicetalk-concurrent-api"))
testImplementation testFixtures(project(":servicetalk-concurrent-internal"))
Expand All @@ -45,6 +46,5 @@ dependencies {
testImplementation "org.mockito:mockito-core:$mockitoCoreVersion"
testImplementation "org.mockito:mockito-junit-jupiter:$mockitoCoreVersion"

testRuntimeOnly enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion")
testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl"
}

0 comments on commit 412460f

Please sign in to comment.