This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7c3dd41d1e0 KAFKA-20553 Eliminate the dependencies on
sourceSets.test.output for coordinator-common module (#22281)
7c3dd41d1e0 is described below
commit 7c3dd41d1e08246a4dfd5c5679bea47f960cdbc9
Author: Murali Basani <[email protected]>
AuthorDate: Thu May 14 13:48:40 2026 +0200
KAFKA-20553 Eliminate the dependencies on sourceSets.test.output for
coordinator-common module (#22281)
Ref : https://issues.apache.org/jira/browse/KAFKA-20553
Similar to https://github.com/apache/kafka/pull/22247
- build.gradle update with new imports
- moved related tests to src/testFixtures
Reviewers: Chia-Ping Tsai <[email protected]>
---
build.gradle | 13 ++++++++++---
.../coordinator/common/runtime/MetadataImageBuilder.java | 0
.../coordinator/common/runtime/MockCoordinatorExecutor.java | 0
.../coordinator/common/runtime/MockCoordinatorTimer.java | 0
.../apache/kafka/coordinator/common/runtime/TestUtil.java | 0
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index b45ca7d12c9..0f1f805bcbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1560,7 +1560,7 @@ project(':group-coordinator') {
testImplementation testFixtures(project(':clients'))
testImplementation testFixtures(project(':server-common'))
- testImplementation project(':coordinator-common').sourceSets.test.output
+ testImplementation testFixtures(project(':coordinator-common'))
testImplementation libs.jacksonDataformatYaml
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
@@ -1778,6 +1778,8 @@ project(':coordinator-common') {
archivesName = "kafka-coordinator-common"
}
+ apply plugin: 'java-test-fixtures'
+
dependencies {
implementation project(':clients')
implementation project(':server-common')
@@ -1787,6 +1789,10 @@ project(':coordinator-common') {
implementation libs.metrics
implementation libs.hdrHistogram
+ testFixturesImplementation project(':clients')
+ testFixturesImplementation project(':metadata')
+ testFixturesImplementation libs.junitJupiter
+
testImplementation testFixtures(project(':clients'))
testImplementation testFixtures(project(':server-common'))
testImplementation libs.junitJupiter
@@ -1829,7 +1835,7 @@ project(':share-coordinator') {
testImplementation testFixtures(project(':clients'))
testImplementation testFixtures(project(':server-common'))
- testImplementation project(':coordinator-common').sourceSets.test.output
+ testImplementation testFixtures(project(':coordinator-common'))
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
testImplementation testLog4j2Libs
@@ -3530,7 +3536,7 @@ project(':jmh-benchmarks') {
implementation project(':raft')
implementation project(':clients')
implementation project(':coordinator-common')
- implementation project(':coordinator-common').sourceSets.test.output
+ implementation testFixtures(project(':coordinator-common'))
implementation project(':group-coordinator')
implementation project(':group-coordinator:group-coordinator-api')
implementation project(':metadata')
@@ -4111,6 +4117,7 @@ gradle.projectsEvaluated {
'clients': ':clients',
'server-common': ':server-common',
'storage/api': ':storage:storage-api',
+ 'coordinator-common': ':coordinator-common',
'group-coordinator': ':group-coordinator',
'share-coordinator': ':share-coordinator',
'metadata': ':metadata',
diff --git
a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MetadataImageBuilder.java
b/coordinator-common/src/testFixtures/java/org/apache/kafka/coordinator/common/runtime/MetadataImageBuilder.java
similarity index 100%
rename from
coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MetadataImageBuilder.java
rename to
coordinator-common/src/testFixtures/java/org/apache/kafka/coordinator/common/runtime/MetadataImageBuilder.java
diff --git
a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorExecutor.java
b/coordinator-common/src/testFixtures/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorExecutor.java
similarity index 100%
rename from
coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorExecutor.java
rename to
coordinator-common/src/testFixtures/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorExecutor.java
diff --git
a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorTimer.java
b/coordinator-common/src/testFixtures/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorTimer.java
similarity index 100%
rename from
coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorTimer.java
rename to
coordinator-common/src/testFixtures/java/org/apache/kafka/coordinator/common/runtime/MockCoordinatorTimer.java
diff --git
a/coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/TestUtil.java
b/coordinator-common/src/testFixtures/java/org/apache/kafka/coordinator/common/runtime/TestUtil.java
similarity index 100%
rename from
coordinator-common/src/test/java/org/apache/kafka/coordinator/common/runtime/TestUtil.java
rename to
coordinator-common/src/testFixtures/java/org/apache/kafka/coordinator/common/runtime/TestUtil.java