mirror of https://github.com/apache/kafka.git
MINOR: reload4j build dependency fixes (#12144)
* Replace `log4j` with `reload4j` in `copyDependantLibs`. Since we have some projects that have an explicit `reload4j` dependency, it was included in the final release release tar - i.e. it was effectively a workaround for this bug. * Exclude `log4j` and `slf4j-log4j12` transitive dependencies for `streams:upgrade-system-tests`. Versions 0100 and 0101 had a transitive dependency to `log4j` and `slf4j-log4j12` via `zkclient` and `zookeeper`. This avoids classpath conflicts that lead to [NoSuchFieldError](https://github.com/qos-ch/reload4j/issues/41) in system tests. Reviewers: Jason Gustafson <jason@confluent.io>
This commit is contained in:
parent
040b11d705
commit
2b14a0bb6d
32
build.gradle
32
build.gradle
|
|
@ -922,7 +922,7 @@ project(':core') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -1701,7 +1701,7 @@ project(':tools') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -1751,7 +1751,7 @@ project(':trogdor') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -2071,7 +2071,10 @@ project(':streams:upgrade-system-tests-0100') {
|
||||||
archivesBaseName = "kafka-streams-upgrade-system-tests-0100"
|
archivesBaseName = "kafka-streams-upgrade-system-tests-0100"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation libs.kafkaStreams_0100
|
testImplementation(libs.kafkaStreams_0100) {
|
||||||
|
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
|
||||||
|
exclude group: 'log4j', module: 'log4j'
|
||||||
|
}
|
||||||
testRuntimeOnly libs.junitJupiter
|
testRuntimeOnly libs.junitJupiter
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2084,7 +2087,10 @@ project(':streams:upgrade-system-tests-0101') {
|
||||||
archivesBaseName = "kafka-streams-upgrade-system-tests-0101"
|
archivesBaseName = "kafka-streams-upgrade-system-tests-0101"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation libs.kafkaStreams_0101
|
testImplementation(libs.kafkaStreams_0101) {
|
||||||
|
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
|
||||||
|
exclude group: 'log4j', module: 'log4j'
|
||||||
|
}
|
||||||
testRuntimeOnly libs.junitJupiter
|
testRuntimeOnly libs.junitJupiter
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2391,7 +2397,7 @@ project(':connect:api') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -2428,7 +2434,7 @@ project(':connect:transforms') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -2468,7 +2474,7 @@ project(':connect:json') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -2534,8 +2540,8 @@ project(':connect:runtime') {
|
||||||
|
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
|
// No need to copy log4j since the module has an explicit dependency on that
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -2614,7 +2620,7 @@ project(':connect:file') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -2653,7 +2659,7 @@ project(':connect:basic-auth-extension') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -2700,7 +2706,7 @@ project(':connect:mirror') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
@ -2735,7 +2741,7 @@ project(':connect:mirror-client') {
|
||||||
tasks.create(name: "copyDependantLibs", type: Copy) {
|
tasks.create(name: "copyDependantLibs", type: Copy) {
|
||||||
from (configurations.testRuntimeClasspath) {
|
from (configurations.testRuntimeClasspath) {
|
||||||
include('slf4j-log4j12*')
|
include('slf4j-log4j12*')
|
||||||
include('log4j*jar')
|
include('reload4j*jar')
|
||||||
}
|
}
|
||||||
from (configurations.runtimeClasspath) {
|
from (configurations.runtimeClasspath) {
|
||||||
exclude('kafka-clients*')
|
exclude('kafka-clients*')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue