You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2022/05/11 03:31:00 UTC
[kafka] branch 3.1 updated: MINOR: reload4j build dependency fixes (#12144)
This is an automated email from the ASF dual-hosted git repository.
ijuma pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/3.1 by this push:
new bafa69edbb MINOR: reload4j build dependency fixes (#12144)
bafa69edbb is described below
commit bafa69edbbf772752009ac02f0f271230a9a2482
Author: Ismael Juma <is...@juma.me.uk>
AuthorDate: Tue May 10 20:14:21 2022 -0700
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 <ja...@confluent.io>
---
build.gradle | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index 308d7182fc..050c182e3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -903,7 +903,7 @@ project(':core') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -1628,7 +1628,7 @@ project(':tools') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -1678,7 +1678,7 @@ project(':trogdor') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -1985,7 +1985,10 @@ project(':streams:upgrade-system-tests-0100') {
archivesBaseName = "kafka-streams-upgrade-system-tests-0100"
dependencies {
- testImplementation libs.kafkaStreams_0100
+ testImplementation(libs.kafkaStreams_0100) {
+ exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+ exclude group: 'log4j', module: 'log4j'
+ }
testRuntimeOnly libs.junitJupiter
}
@@ -1998,7 +2001,10 @@ project(':streams:upgrade-system-tests-0101') {
archivesBaseName = "kafka-streams-upgrade-system-tests-0101"
dependencies {
- testImplementation libs.kafkaStreams_0101
+ testImplementation(libs.kafkaStreams_0101) {
+ exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+ exclude group: 'log4j', module: 'log4j'
+ }
testRuntimeOnly libs.junitJupiter
}
@@ -2278,7 +2284,7 @@ project(':connect:api') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -2315,7 +2321,7 @@ project(':connect:transforms') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -2355,7 +2361,7 @@ project(':connect:json') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -2421,8 +2427,8 @@ project(':connect:runtime') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
+ // No need to copy log4j since the module has an explicit dependency on that
include('slf4j-log4j12*')
- include('log4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -2502,7 +2508,7 @@ project(':connect:file') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -2541,7 +2547,7 @@ project(':connect:basic-auth-extension') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -2588,7 +2594,7 @@ project(':connect:mirror') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
@@ -2623,7 +2629,7 @@ project(':connect:mirror-client') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
- include('log4j*jar')
+ include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')