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 4ef1ff840f8 KAFKA-20553 Eliminate the dependencies on
sourceSets.test.output for server and storage module (#22276)
4ef1ff840f8 is described below
commit 4ef1ff840f8f7b1326e62c71f67996693c364d46
Author: Ken Huang <[email protected]>
AuthorDate: Fri May 15 07:27:07 2026 +0800
KAFKA-20553 Eliminate the dependencies on sourceSets.test.output for server
and storage module (#22276)
Gradle test fixtures to the clients module and removes all dependencies
on sourceSets.test.output. We should revisit other usages in this JIRA.
This will simplify the dependency graph and unblock the upgrade to
Gradle 9.5+
This patch is working on `server` and `storage`
Reviewers: Murali Basani <[email protected]>, Chia-Ping Tsai
<[email protected]>
---
build.gradle | 25 ++++++++++++++++++----
.../server/metrics/ClientMetricsTestUtils.java | 0
.../server/share/fetch/ShareFetchTestUtils.java | 0
.../server/util/MockAlterPartitionManager.java | 0
.../log/remote/storage/LocalTieredStorage.java | 0
.../storage/LocalTieredStorageCondition.java | 0
.../remote/storage/LocalTieredStorageEvent.java | 0
.../remote/storage/LocalTieredStorageHistory.java | 0
.../remote/storage/LocalTieredStorageListener.java | 0
.../remote/storage/LocalTieredStorageSnapshot.java | 0
.../storage/LocalTieredStorageTraverser.java | 0
.../remote/storage/RemoteLogSegmentFileset.java | 0
.../storage/RemoteTopicPartitionDirectory.java | 0
.../server/log/remote/storage/Transferer.java | 0
14 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index 0f1f805bcbc..af5955316e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1004,6 +1004,8 @@ project(':server') {
archivesName = "kafka-server"
}
+ apply plugin: 'java-test-fixtures'
+
dependencies {
compileOnly libs.bndlib
compileOnly libs.spotbugs
@@ -1034,6 +1036,12 @@ project(':server') {
testImplementation testFixtures(project(':storage:storage-api'))
testImplementation testFixtures(project(':server-common'))
+ testFixturesImplementation project(':clients')
+ testFixturesImplementation testFixtures(project(':clients'))
+ testFixturesImplementation project(':metadata')
+ testFixturesImplementation project(':server-common')
+ testFixturesImplementation libs.junitJupiter
+
testRuntimeOnly runtimeTestLibs
}
@@ -1152,7 +1160,7 @@ project(':core') {
testImplementation testFixtures(project(':raft'))
testImplementation testFixtures(project(':server-common'))
testImplementation testFixtures(project(':storage:storage-api'))
- testImplementation project(':server').sourceSets.test.output
+ testImplementation testFixtures(project(':server'))
testImplementation project(':streams')
testImplementation project(':test-common:test-common-runtime')
testImplementation project(':test-common:test-common-internal-api')
@@ -2429,6 +2437,8 @@ project(':storage') {
archivesName = "kafka-storage"
}
+ apply plugin: 'java-test-fixtures'
+
configurations {
generator
}
@@ -2445,6 +2455,12 @@ project(':storage') {
implementation libs.jacksonDatabind
implementation libs.metrics
+ testFixturesImplementation project(':storage:storage-api')
+ testFixturesImplementation project(':clients')
+ testFixturesImplementation testFixtures(project(':clients'))
+ testFixturesImplementation project(':server-common')
+ testFixturesImplementation libs.slf4jApi
+
testImplementation project(':clients')
testImplementation testFixtures(project(':clients'))
testImplementation project(':core')
@@ -2641,8 +2657,8 @@ project(':tools') {
testImplementation project(':clients')
testImplementation testFixtures(project(':clients'))
testImplementation project(':server')
- testImplementation project(':server').sourceSets.test.output
testImplementation project(':core')
+ testImplementation testFixtures(project(':server'))
testImplementation project(':core').sourceSets.test.output
testImplementation project(':test-common:test-common-internal-api')
testImplementation project(':test-common:test-common-runtime')
@@ -2652,7 +2668,7 @@ project(':tools') {
testImplementation project(':connect:runtime')
testImplementation project(':connect:runtime').sourceSets.test.output
testImplementation project(':storage:storage-api').sourceSets.main.output
- testImplementation project(':storage').sourceSets.test.output
+ testImplementation testFixtures(project(':storage'))
testImplementation project(':streams')
testImplementation project(':streams').sourceSets.test.output
testImplementation
project(':streams:integration-tests').sourceSets.test.output
@@ -3551,7 +3567,6 @@ project(':jmh-benchmarks') {
implementation testFixtures(project(':clients'))
implementation testFixtures(project(':server-common'))
implementation testFixtures(project(':metadata'))
- implementation project(':server').sourceSets.test.output
implementation libs.jmhCore
annotationProcessor libs.jmhGeneratorAnnProcess
@@ -4116,8 +4131,10 @@ gradle.projectsEvaluated {
def protectedModules = [
'clients': ':clients',
'server-common': ':server-common',
+ 'server': ':server',
'storage/api': ':storage:storage-api',
'coordinator-common': ':coordinator-common',
+ 'storage': ':storage',
'group-coordinator': ':group-coordinator',
'share-coordinator': ':share-coordinator',
'metadata': ':metadata',
diff --git
a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java
b/server/src/testFixtures/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java
similarity index 100%
rename from
server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java
rename to
server/src/testFixtures/java/org/apache/kafka/server/metrics/ClientMetricsTestUtils.java
diff --git
a/server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java
b/server/src/testFixtures/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java
similarity index 100%
rename from
server/src/test/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java
rename to
server/src/testFixtures/java/org/apache/kafka/server/share/fetch/ShareFetchTestUtils.java
diff --git
a/server/src/test/java/org/apache/kafka/server/util/MockAlterPartitionManager.java
b/server/src/testFixtures/java/org/apache/kafka/server/util/MockAlterPartitionManager.java
similarity index 100%
rename from
server/src/test/java/org/apache/kafka/server/util/MockAlterPartitionManager.java
rename to
server/src/testFixtures/java/org/apache/kafka/server/util/MockAlterPartitionManager.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorage.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageCondition.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageCondition.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageCondition.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageCondition.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageEvent.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageEvent.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageEvent.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageEvent.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageHistory.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageHistory.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageHistory.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageHistory.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageListener.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageListener.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageListener.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageListener.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageSnapshot.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageSnapshot.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageSnapshot.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageSnapshot.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageTraverser.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageTraverser.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageTraverser.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/LocalTieredStorageTraverser.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentFileset.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentFileset.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentFileset.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentFileset.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteTopicPartitionDirectory.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/RemoteTopicPartitionDirectory.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteTopicPartitionDirectory.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/RemoteTopicPartitionDirectory.java
diff --git
a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/Transferer.java
b/storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/Transferer.java
similarity index 100%
rename from
storage/src/test/java/org/apache/kafka/server/log/remote/storage/Transferer.java
rename to
storage/src/testFixtures/java/org/apache/kafka/server/log/remote/storage/Transferer.java
