Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

exclude log4j from transitive dependencies of curator (try again) #1141

Merged
merged 1 commit into from Aug 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions misk-zookeeper-testing/build.gradle
Expand Up @@ -7,8 +7,14 @@ buildscript {
apply plugin: 'kotlin-jpa'

dependencies {
compile dep.curatorFramework
compile dep.zookeeper
compile(dep.curatorFramework) {
exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
exclude(group: 'log4j', module: 'log4j')
}
compile(dep.zookeeper) {
exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
exclude(group: 'log4j', module: 'log4j')
}
compile dep.docker
compile project(':misk-testing')
compile project(':misk-zookeeper')
Expand Down
11 changes: 9 additions & 2 deletions misk-zookeeper/build.gradle
Expand Up @@ -9,13 +9,20 @@ apply plugin: 'kotlin-jpa'
dependencies {
compile(dep.curatorFramework) {
exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
exclude(group: 'log4j', module: 'log4j')
}
compile project(':misk')
compile dep.zookeeper
compile(dep.zookeeper) {
exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
exclude(group: 'log4j', module: 'log4j')
}

testCompile dep.docker
testCompile dep.junitApi
testCompile dep.zookeeper
testCompile(dep.zookeeper) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

testCompile includes the configurations from compile does it not?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the excludes don't propagate. Anywhere you explicitly depend on zookeeper or curator, you need to exclude this package

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so, I'm still not totally sure this'll work, but hopeful

exclude(group: 'org.slf4j', module: 'slf4j-log4j12')
exclude(group: 'log4j', module: 'log4j')
}
testCompile project(':misk-testing')
testCompile project(':misk-zookeeper-testing')
}
Expand Down