From 1807f6314f318d55614869e9c25a87efcbc095c0 Mon Sep 17 00:00:00 2001 From: frankvicky Date: Thu, 17 Oct 2024 15:12:07 +0800 Subject: [PATCH 01/12] KAFKA-17811: Separate modules to use different JDKs --- build.gradle | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build.gradle b/build.gradle index 3ef6f35ccc7b8..880f12bc31f6c 100644 --- a/build.gradle +++ b/build.gradle @@ -292,6 +292,20 @@ subprojects { } } + def modulesNeedingJava17 = [ + ":core", ":coordinator-common", ":generator", ":group-coordinator", + ":metadata", ":raft", ":server", ":server-common", ":share", ":storage", + ":share-coordinator", ":test-common", ":tools", ":transaction-coordinator" + ] + + if (modulesNeedingJava17.any { project.path.startsWith(it) }) { + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } + } + tasks.withType(JavaCompile) { options.encoding = 'UTF-8' options.compilerArgs << "-Xlint:all" From de5e1c26cc56575ea5dc9bb08a99a65e4997e759 Mon Sep 17 00:00:00 2001 From: frankvicky Date: Fri, 15 Nov 2024 22:58:52 +0800 Subject: [PATCH 02/12] KAFKA-17811: Update build.gradle --- build.gradle | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 1a3d03f0eece2..8a5bbcec1fbf5 100644 --- a/build.gradle +++ b/build.gradle @@ -116,6 +116,13 @@ ext { configureJavaCompiler = { name, options -> // -parameters generates arguments with parameter names in TestInfo#getDisplayName. // ref: https://github.com/junit-team/junit5/blob/4c0dddad1b96d4a20e92a2cd583954643ac56ac0/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java#L161-L164 + + def modulesNeedingJava17 = [ + ":core", ":coordinator-common", ":generator", ":group-coordinator", + ":metadata", ":raft", ":server", ":server-common", ":share", ":storage", + ":share-coordinator", ":test-common", ":tools", ":transaction-coordinator" + ] + if (name == "compileTestJava" || name == "compileTestScala") { options.compilerArgs << "-parameters" options.compilerArgs += ["--release", String.valueOf(minJavaVersion)] @@ -128,7 +135,11 @@ ext { options.compilerArgs << "-Xlint:-serial" options.compilerArgs << "-Xlint:-try" options.compilerArgs << "-Werror" - options.compilerArgs += ["--release", String.valueOf(minJavaVersion)] + if (modulesNeedingJava17.any { project.path.startsWith(it) }) { + options.compilerArgs += ["--release", String.valueOf(17)] + } else { + options.compilerArgs += ["--release", String.valueOf(minJavaVersion)] + } } } @@ -319,20 +330,6 @@ subprojects { } } - def modulesNeedingJava17 = [ - ":core", ":coordinator-common", ":generator", ":group-coordinator", - ":metadata", ":raft", ":server", ":server-common", ":share", ":storage", - ":share-coordinator", ":test-common", ":tools", ":transaction-coordinator" - ] - - if (modulesNeedingJava17.any { project.path.startsWith(it) }) { - java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } - } - } - tasks.withType(JavaCompile) { configureJavaCompiler(name, options) } From 694a59817f66d683163779ea64d584476267812f Mon Sep 17 00:00:00 2001 From: frankvicky Date: Mon, 18 Nov 2024 11:25:25 +0800 Subject: [PATCH 03/12] KAFKA-17811: refactor build.gradle --- build.gradle | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 8a5bbcec1fbf5..eebeb26f59c61 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,8 @@ plugins { ext { gradleVersion = versions.gradle - minJavaVersion = 11 + minClientJavaVersion = 11 + minServerJavaVersion = 17 buildVersionFileName = "kafka-version.properties" defaultMaxHeapSize = "2g" @@ -118,28 +119,29 @@ ext { // ref: https://github.com/junit-team/junit5/blob/4c0dddad1b96d4a20e92a2cd583954643ac56ac0/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java#L161-L164 def modulesNeedingJava17 = [ - ":core", ":coordinator-common", ":generator", ":group-coordinator", - ":metadata", ":raft", ":server", ":server-common", ":share", ":storage", - ":share-coordinator", ":test-common", ":tools", ":transaction-coordinator" + ":core", ":coordinator-common", ":generator", ":group-coordinator", + ":metadata", ":raft", ":server", ":server-common", ":share", ":storage", + ":share-coordinator", ":test-common", ":tools", ":transaction-coordinator" ] - if (name == "compileTestJava" || name == "compileTestScala") { + def releaseVersion = modulesNeedingJava17.any { project.path.startsWith(it) } ? + minServerJavaVersion : minClientJavaVersion + + options.compilerArgs << "-encoding" << "UTF-8" + options.compilerArgs += ["--release", String.valueOf(releaseVersion)] + + if (name in ["compileTestJava", "compileTestScala"]) { options.compilerArgs << "-parameters" - options.compilerArgs += ["--release", String.valueOf(minJavaVersion)] - } else if (name == "compileJava" || name == "compileScala") { + } else if (name in ["compileJava", "compileScala"]) { options.compilerArgs << "-Xlint:all" - if (!project.path.startsWith(":connect") && !project.path.startsWith(":storage")) + + if (!project.path.startsWith(":connect") && !project.path.startsWith(":storage")) { options.compilerArgs << "-Xlint:-rawtypes" - options.compilerArgs << "-encoding" << "UTF-8" - options.compilerArgs << "-Xlint:-rawtypes" + } + options.compilerArgs << "-Xlint:-serial" options.compilerArgs << "-Xlint:-try" options.compilerArgs << "-Werror" - if (modulesNeedingJava17.any { project.path.startsWith(it) }) { - options.compilerArgs += ["--release", String.valueOf(17)] - } else { - options.compilerArgs += ["--release", String.valueOf(minJavaVersion)] - } } } @@ -738,6 +740,15 @@ subprojects { tasks.withType(ScalaCompile) { + def modulesNeedingJava17 = [ + ":core", ":coordinator-common", "connect:runtime", "connect:mirror", "connect:test-plugins", "connect:file", + ":generator", ":group-coordinator", ":metadata", ":raft", ":server", ":server-common", ":share", ":storage", + ":share-coordinator", ":test-common", ":tools", ":transaction-coordinator" + ] + + def releaseVersion = modulesNeedingJava17.any { project.path.startsWith(it) } ? + minServerJavaVersion : minClientJavaVersion + scalaCompileOptions.keepAliveMode = userKeepAliveMode scalaCompileOptions.additionalParameters = [ @@ -781,8 +792,7 @@ subprojects { scalaCompileOptions.additionalParameters += ["-opt-warnings", "-Xlint:strict-unsealed-patmat"] // Scala 2.13.2 introduces compiler warnings suppression, which is a pre-requisite for -Xfatal-warnings scalaCompileOptions.additionalParameters += ["-Xfatal-warnings"] - - scalaCompileOptions.additionalParameters += ["-release", String.valueOf(minJavaVersion)] + scalaCompileOptions.additionalParameters += ["--release", String.valueOf(releaseVersion)] configureJavaCompiler(name, options) From 35bc484189a5f5b15336a10e9e42a0f49b1989f5 Mon Sep 17 00:00:00 2001 From: frankvicky Date: Sat, 23 Nov 2024 00:34:18 +0800 Subject: [PATCH 04/12] KAFKA-17811: refactor build.gradle --- build.gradle | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index eebeb26f59c61..0ba18115a47be 100644 --- a/build.gradle +++ b/build.gradle @@ -114,18 +114,16 @@ ext { commitId = determineCommitId() - configureJavaCompiler = { name, options -> + isModuleNeedJava11 = { projectPath -> + def modulesNeedingJava11 = [":clients", ":streams"] + modulesNeedingJava11.any { projectPath.startsWith(it) } + } + + configureJavaCompiler = { name, options, projectPath -> // -parameters generates arguments with parameter names in TestInfo#getDisplayName. // ref: https://github.com/junit-team/junit5/blob/4c0dddad1b96d4a20e92a2cd583954643ac56ac0/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java#L161-L164 - def modulesNeedingJava17 = [ - ":core", ":coordinator-common", ":generator", ":group-coordinator", - ":metadata", ":raft", ":server", ":server-common", ":share", ":storage", - ":share-coordinator", ":test-common", ":tools", ":transaction-coordinator" - ] - - def releaseVersion = modulesNeedingJava17.any { project.path.startsWith(it) } ? - minServerJavaVersion : minClientJavaVersion + def releaseVersion = isModuleNeedJava11(projectPath) ? minClientJavaVersion : minServerJavaVersion options.compilerArgs << "-encoding" << "UTF-8" options.compilerArgs += ["--release", String.valueOf(releaseVersion)] @@ -134,11 +132,6 @@ ext { options.compilerArgs << "-parameters" } else if (name in ["compileJava", "compileScala"]) { options.compilerArgs << "-Xlint:all" - - if (!project.path.startsWith(":connect") && !project.path.startsWith(":storage")) { - options.compilerArgs << "-Xlint:-rawtypes" - } - options.compilerArgs << "-Xlint:-serial" options.compilerArgs << "-Xlint:-try" options.compilerArgs << "-Werror" @@ -333,7 +326,7 @@ subprojects { } tasks.withType(JavaCompile) { - configureJavaCompiler(name, options) + configureJavaCompiler(name, options, project.path) } if (shouldPublish) { @@ -739,16 +732,9 @@ subprojects { } tasks.withType(ScalaCompile) { - - def modulesNeedingJava17 = [ - ":core", ":coordinator-common", "connect:runtime", "connect:mirror", "connect:test-plugins", "connect:file", - ":generator", ":group-coordinator", ":metadata", ":raft", ":server", ":server-common", ":share", ":storage", - ":share-coordinator", ":test-common", ":tools", ":transaction-coordinator" - ] - - def releaseVersion = modulesNeedingJava17.any { project.path.startsWith(it) } ? - minServerJavaVersion : minClientJavaVersion - + def modulesNeedingJava11 = [":clients", ":streams"] + def releaseVersion = modulesNeedingJava11.any { project.path.startsWith(it) } ? + minClientJavaVersion : minServerJavaVersion scalaCompileOptions.keepAliveMode = userKeepAliveMode scalaCompileOptions.additionalParameters = [ @@ -794,7 +780,7 @@ subprojects { scalaCompileOptions.additionalParameters += ["-Xfatal-warnings"] scalaCompileOptions.additionalParameters += ["--release", String.valueOf(releaseVersion)] - configureJavaCompiler(name, options) + configureJavaCompiler(name, options, project.path) configure(scalaCompileOptions.forkOptions) { memoryMaximumSize = defaultMaxHeapSize @@ -2590,7 +2576,6 @@ project(':streams') { // testCompileOnly prevents streams from exporting a dependency on test-utils, which would cause a dependency cycle testCompileOnly project(':streams:test-utils') - testImplementation project(':metadata') testImplementation project(':clients').sourceSets.test.output testImplementation libs.reload4j testImplementation libs.junitJupiter @@ -2599,7 +2584,6 @@ project(':streams') { testImplementation libs.mockitoCore testImplementation libs.mockitoJunitJupiter // supports MockitoExtension testImplementation libs.junitPlatformSuiteEngine // supports suite test - testImplementation project(':group-coordinator') testRuntimeOnly project(':streams:test-utils') testRuntimeOnly runtimeTestLibs From cd4697bcc1eaf128d9e165b46ab688db5f08417c Mon Sep 17 00:00:00 2001 From: frankvicky Date: Sat, 23 Nov 2024 00:56:13 +0800 Subject: [PATCH 05/12] KAFKA-17811: refactor build.gradle --- build.gradle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0ba18115a47be..9016133ef2605 100644 --- a/build.gradle +++ b/build.gradle @@ -115,8 +115,8 @@ ext { commitId = determineCommitId() isModuleNeedJava11 = { projectPath -> - def modulesNeedingJava11 = [":clients", ":streams"] - modulesNeedingJava11.any { projectPath.startsWith(it) } + def modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] + modulesNeedingJava11.any { projectPath.equals(it) } } configureJavaCompiler = { name, options, projectPath -> @@ -131,6 +131,8 @@ ext { if (name in ["compileTestJava", "compileTestScala"]) { options.compilerArgs << "-parameters" } else if (name in ["compileJava", "compileScala"]) { + if (!project.path.startsWith(":connect") && !project.path.startsWith(":storage")) + options.compilerArgs << "-Xlint:-rawtypes" options.compilerArgs << "-Xlint:all" options.compilerArgs << "-Xlint:-serial" options.compilerArgs << "-Xlint:-try" @@ -732,8 +734,8 @@ subprojects { } tasks.withType(ScalaCompile) { - def modulesNeedingJava11 = [":clients", ":streams"] - def releaseVersion = modulesNeedingJava11.any { project.path.startsWith(it) } ? + def modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] + def releaseVersion = modulesNeedingJava11.any { project.path.equals(it) } ? minClientJavaVersion : minServerJavaVersion scalaCompileOptions.keepAliveMode = userKeepAliveMode From 95fa3929072e24962f5ad15588af1a23f6592b0f Mon Sep 17 00:00:00 2001 From: frankvicky Date: Sat, 23 Nov 2024 12:02:33 +0800 Subject: [PATCH 06/12] KAFKA-17811: refactor build.gradle --- build.gradle | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 9016133ef2605..e14e1e2872aa2 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,8 @@ ext { gradleVersion = versions.gradle minClientJavaVersion = 11 minServerJavaVersion = 17 + modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] + buildVersionFileName = "kafka-version.properties" defaultMaxHeapSize = "2g" @@ -114,16 +116,11 @@ ext { commitId = determineCommitId() - isModuleNeedJava11 = { projectPath -> - def modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] - modulesNeedingJava11.any { projectPath.equals(it) } - } - configureJavaCompiler = { name, options, projectPath -> // -parameters generates arguments with parameter names in TestInfo#getDisplayName. // ref: https://github.com/junit-team/junit5/blob/4c0dddad1b96d4a20e92a2cd583954643ac56ac0/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java#L161-L164 - def releaseVersion = isModuleNeedJava11(projectPath) ? minClientJavaVersion : minServerJavaVersion + def releaseVersion = modulesNeedingJava11.any { projectPath == it } ? minClientJavaVersion : minServerJavaVersion options.compilerArgs << "-encoding" << "UTF-8" options.compilerArgs += ["--release", String.valueOf(releaseVersion)] @@ -734,9 +731,7 @@ subprojects { } tasks.withType(ScalaCompile) { - def modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] - def releaseVersion = modulesNeedingJava11.any { project.path.equals(it) } ? - minClientJavaVersion : minServerJavaVersion + def releaseVersion = modulesNeedingJava11.any { project.path == it } ? minClientJavaVersion : minServerJavaVersion scalaCompileOptions.keepAliveMode = userKeepAliveMode scalaCompileOptions.additionalParameters = [ From 1bbf39cf6dd2c529caaa4a733ca1c1317db8546c Mon Sep 17 00:00:00 2001 From: frankvicky Date: Sun, 24 Nov 2024 13:12:10 +0800 Subject: [PATCH 07/12] KAFKA-17811: rename variable --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e14e1e2872aa2..274db94cb3008 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ plugins { ext { gradleVersion = versions.gradle minClientJavaVersion = 11 - minServerJavaVersion = 17 + minNonClientJavaVersion = 17 modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] buildVersionFileName = "kafka-version.properties" @@ -120,7 +120,7 @@ ext { // -parameters generates arguments with parameter names in TestInfo#getDisplayName. // ref: https://github.com/junit-team/junit5/blob/4c0dddad1b96d4a20e92a2cd583954643ac56ac0/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java#L161-L164 - def releaseVersion = modulesNeedingJava11.any { projectPath == it } ? minClientJavaVersion : minServerJavaVersion + def releaseVersion = modulesNeedingJava11.any { projectPath == it } ? minClientJavaVersion : minNonClientJavaVersion options.compilerArgs << "-encoding" << "UTF-8" options.compilerArgs += ["--release", String.valueOf(releaseVersion)] @@ -731,7 +731,7 @@ subprojects { } tasks.withType(ScalaCompile) { - def releaseVersion = modulesNeedingJava11.any { project.path == it } ? minClientJavaVersion : minServerJavaVersion + def releaseVersion = modulesNeedingJava11.any { project.path == it } ? minClientJavaVersion : minNonClientJavaVersion scalaCompileOptions.keepAliveMode = userKeepAliveMode scalaCompileOptions.additionalParameters = [ From ebeb7f39237fade964d6cb05550b86dff3a07df6 Mon Sep 17 00:00:00 2001 From: frankvicky Date: Sun, 24 Nov 2024 15:29:49 +0800 Subject: [PATCH 08/12] KAFKA-17811: add comments for connect:api --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 274db94cb3008..40ce41f0ed5db 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,7 @@ ext { gradleVersion = versions.gradle minClientJavaVersion = 11 minNonClientJavaVersion = 17 + // The connect:api module also belongs to the clients module, but it has already been bumped to JDK 17 as part of KIP-1032. modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] buildVersionFileName = "kafka-version.properties" From b41f9abe16b9653b8a970de9b236a168898a7061 Mon Sep 17 00:00:00 2001 From: frankvicky Date: Mon, 25 Nov 2024 22:20:50 +0800 Subject: [PATCH 09/12] KAFKA-17811: Suppress removal warning --- .../kafka/connect/runtime/isolation/SynchronizationTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/SynchronizationTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/SynchronizationTest.java index 1f3d42fd3dc15..70b875b21b8c0 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/SynchronizationTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/isolation/SynchronizationTest.java @@ -456,6 +456,7 @@ private static void printStacktrace(ThreadInfo info, StringBuilder sb) { } } + @SuppressWarnings("removal") private static ThreadFactory threadFactoryWithNamedThreads(String threadPrefix) { AtomicInteger threadNumber = new AtomicInteger(1); return r -> { From 7b4bac849e9f1a5f0bbbee0bf127ae4372d1dc09 Mon Sep 17 00:00:00 2001 From: frankvicky Date: Tue, 26 Nov 2024 09:28:50 +0800 Subject: [PATCH 10/12] KAFKA-17811: update build.yml and ci-complete.yml --- .github/workflows/build.yml | 2 +- .github/workflows/ci-complete.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d6e76d50c26b..e860073ecdd5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,7 +145,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 23, 11 ] # If we change these, make sure to adjust ci-complete.yml + java: [ 23, 17 ] # If we change these, make sure to adjust ci-complete.yml name: JUnit tests Java ${{ matrix.java }} steps: - name: Checkout code diff --git a/.github/workflows/ci-complete.yml b/.github/workflows/ci-complete.yml index 25c96ac2d74c7..982eb7725e0a0 100644 --- a/.github/workflows/ci-complete.yml +++ b/.github/workflows/ci-complete.yml @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 23, 11 ] + java: [ 23, 17 ] artifact-prefix: [ "build-scan-test-", "build-scan-quarantined-test-"] steps: - name: Env From 2c0c4385f64754611003aeffa0e7158ff7e20075 Mon Sep 17 00:00:00 2001 From: frankvicky Date: Tue, 26 Nov 2024 16:43:04 +0800 Subject: [PATCH 11/12] KAFKA-17811: address comments --- build.gradle | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d04c5d7861ed9..b1e42bed5e67a 100644 --- a/build.gradle +++ b/build.gradle @@ -1874,7 +1874,8 @@ project(':clients') { testRuntimeOnly libs.jacksonDatabind testRuntimeOnly libs.jacksonJDK8Datatypes - testRuntimeOnly runtimeTestLibs + testRuntimeOnly libs.slf4jReload4j + testRuntimeOnly libs.junitPlatformLanucher generator project(':generator') } @@ -2616,7 +2617,8 @@ project(':streams') { testImplementation libs.junitPlatformSuiteEngine // supports suite test testRuntimeOnly project(':streams:test-utils') - testRuntimeOnly runtimeTestLibs + testRuntimeOnly libs.slf4jReload4j + testRuntimeOnly libs.junitPlatformLanucher generator project(':generator') } @@ -2755,7 +2757,8 @@ project(':streams:streams-scala') { testImplementation libs.junitJupiter testImplementation libs.mockitoJunitJupiter // supports MockitoExtension - testRuntimeOnly runtimeTestLibs + testRuntimeOnly libs.slf4jReload4j + testRuntimeOnly libs.junitPlatformLanucher } javadoc { @@ -2856,7 +2859,8 @@ project(':streams:test-utils') { testImplementation libs.mockitoCore testImplementation libs.hamcrest - testRuntimeOnly runtimeTestLibs + testRuntimeOnly libs.slf4jReload4j + testRuntimeOnly libs.junitPlatformLanucher } tasks.create(name: "copyDependantLibs", type: Copy) { From 7def29fe1e8af9674d36b13d5784c4e2e486599b Mon Sep 17 00:00:00 2001 From: frankvicky Date: Tue, 26 Nov 2024 19:51:21 +0800 Subject: [PATCH 12/12] KAFKA-17811: Add :test-common:test-common-runtime to jdk 11 modules --- build.gradle | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b1e42bed5e67a..39ae8a267449d 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ ext { minClientJavaVersion = 11 minNonClientJavaVersion = 17 // The connect:api module also belongs to the clients module, but it has already been bumped to JDK 17 as part of KIP-1032. - modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] + modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala", ":test-common:test-common-runtime"] buildVersionFileName = "kafka-version.properties" @@ -1874,8 +1874,7 @@ project(':clients') { testRuntimeOnly libs.jacksonDatabind testRuntimeOnly libs.jacksonJDK8Datatypes - testRuntimeOnly libs.slf4jReload4j - testRuntimeOnly libs.junitPlatformLanucher + testRuntimeOnly runtimeTestLibs generator project(':generator') } @@ -2617,8 +2616,7 @@ project(':streams') { testImplementation libs.junitPlatformSuiteEngine // supports suite test testRuntimeOnly project(':streams:test-utils') - testRuntimeOnly libs.slf4jReload4j - testRuntimeOnly libs.junitPlatformLanucher + testRuntimeOnly runtimeTestLibs generator project(':generator') } @@ -2757,8 +2755,7 @@ project(':streams:streams-scala') { testImplementation libs.junitJupiter testImplementation libs.mockitoJunitJupiter // supports MockitoExtension - testRuntimeOnly libs.slf4jReload4j - testRuntimeOnly libs.junitPlatformLanucher + testRuntimeOnly runtimeTestLibs } javadoc { @@ -2859,8 +2856,7 @@ project(':streams:test-utils') { testImplementation libs.mockitoCore testImplementation libs.hamcrest - testRuntimeOnly libs.slf4jReload4j - testRuntimeOnly libs.junitPlatformLanucher + testRuntimeOnly runtimeTestLibs } tasks.create(name: "copyDependantLibs", type: Copy) {