diff --git a/build.gradle b/build.gradle index 308d7182fcf11..050c182e3e5ea 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*')