-
Notifications
You must be signed in to change notification settings - Fork 14k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
KAFKA-17811: Separate modules to use different JDKs #17522
Conversation
ce2af51
to
1807f63
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@frankvicky thanks for this patch
@@ -128,7 +135,11 @@ ext { | |||
options.compilerArgs << "-Xlint:-serial" | |||
options.compilerArgs << "-Xlint:-try" | |||
options.compilerArgs << "-Werror" | |||
options.compilerArgs += ["--release", String.valueOf(minJavaVersion)] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please add minClientJavaVersion
and minServerJavaVersion
?
build.gradle
Outdated
@@ -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", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
connect:runtime
, connect:mirror
, connect:test-plugins
, and ``connect:file` should use JDK 17 as well
options.compilerArgs += ["--release", String.valueOf(17)] | ||
} else { | ||
options.compilerArgs += ["--release", String.valueOf(minJavaVersion)] | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please update scala module as well
build.gradle
Outdated
":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)] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this need to be updated too.
3d9b01a
to
35bc484
Compare
|
||
scalaCompileOptions.additionalParameters += ["-release", String.valueOf(minJavaVersion)] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
streams-scala
and streams:test-utils
need java 11
@@ -47,7 +47,8 @@ plugins { | |||
|
|||
ext { | |||
gradleVersion = versions.gradle | |||
minJavaVersion = 11 | |||
minClientJavaVersion = 11 | |||
minServerJavaVersion = 17 | |||
buildVersionFileName = "kafka-version.properties" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please move modulesNeedingJava11
up to line#52?
modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"]
build.gradle
Outdated
// -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 | ||
if (name == "compileTestJava" || name == "compileTestScala") { | ||
|
||
def releaseVersion = isModuleNeedJava11(projectPath) ? minClientJavaVersion : minServerJavaVersion |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
def releaseVersion = modulesNeedingJava11.any { projectPath == it } ? minClientJavaVersion : minServerJavaVersion
build.gradle
Outdated
@@ -726,7 +734,9 @@ subprojects { | |||
} | |||
|
|||
tasks.withType(ScalaCompile) { | |||
|
|||
def modulesNeedingJava11 = [":clients", ":streams", ":streams:test-utils", ":streams-scala"] | |||
def releaseVersion = modulesNeedingJava11.any { project.path.equals(it) } ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
def releaseVersion = modulesNeedingJava11.any { project.path == it } ? minClientJavaVersion : minServerJavaVersion
Hi @chia7712 |
build.gradle
Outdated
@@ -47,7 +47,10 @@ plugins { | |||
|
|||
ext { | |||
gradleVersion = versions.gradle | |||
minJavaVersion = 11 | |||
minClientJavaVersion = 11 | |||
minServerJavaVersion = 17 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be more accurate to say minNonClientJavaVersion
as this includes things like tools
and other such modules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sense 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minNonClientJavaVersion looks good to me. Additionally, the connect:api module belongs to client APIs, but in KIP-1032 we decided to bump the Connect module to JDK 17. Could you please add a comment for the Connect module?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@frankvicky could you please check the version of jars on your local?
Hi @chia7712 |
@frankvicky Could you please use
|
Hi @chia7712 |
@frankvicky Could you please update CI file to use JDK 17 and 23 https://github.com/apache/kafka/blob/trunk/.github/workflows/build.yml#L148 |
82b2549
to
7b4bac8
Compare
https://github.com/apache/kafka/blob/trunk/build.gradle#L1872 @frankvicky please remove the
|
build.gradle
Outdated
@@ -1869,7 +1874,8 @@ project(':clients') { | |||
|
|||
testRuntimeOnly libs.jacksonDatabind | |||
testRuntimeOnly libs.jacksonJDK8Datatypes | |||
testRuntimeOnly runtimeTestLibs | |||
testRuntimeOnly libs.slf4jReload4j |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please apply this approach on streams module too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have applied to 4 modules which need JDK 11
e1cd08c
to
2c0c438
Compare
@frankvicky I think current approach is incorrect. We should make |
Reviewers: Chia-Ping Tsai <[email protected]>
Hey @chia7712 @frankvicky it looks like after merging this PR it's no longer possible (or at least straightforward) to run tests in client modules (specifically streams) from within the IDE (IntelliJ specifically). I'm getting:
I've tried manually setting the module in the project settings but that doesn't seem to work. Would be good to document something in the project README. Note that it still works using cc @ableegoldman who was running into similar issues |
Could you please share the details to me? For example, how do you run the tests by IntelliJ? |
@agavra Are you using JDK 11 to run the streams tests? If so, that could be an issue since the generator module requires JDK 17. I assume all Kafka developers should use JDK 17, as we typically build the entire project during development. |
🤦 this is why I shouldn't work at night, I had set the module versions to JDK 17 but not the project version to JDK 17. It now works, thanks @chia7712. |
We do indeed need to compile the project with 17, but we should recommend that anyone working on the clients (or any other modules that still support 11) at least set their IDE's language version to JDK11 to avoid accidentally using APIs that don't exist back in 11 (looking at you |
@ableegoldman Thanks for your feedback. I agree that we should prioritize making our developers' experience better. I plan to add sourceCompatibility back to build.gradle since IntelliJ IDEA sets the language level based on sourceCompatibility by default (Gradle Documentation). The screenshot below demonstrates that IntelliJ IDEA can automatically highlight unsupported usages. With this change, developers won't need to manually configure the language level. |
open KAFKA-18186 to address this. @ableegoldman please feel free to share your thoughts on this approach. |
I see some confusion here and I'll try to clarify it.
We should make sure it's possible to run tests with Java 11 for the modules that support it since it's possible to have issues at runtime that only affect a particular version.
The expected behavior is that the IDE & gradle plugin support the --release flag which has the correct behavior (it sets the appropriate source and binary versions and ensures the standard library signatures also match it).
Are we sure the Gradle plugin doesn't handle this properly? If so, we should add the workaround, but also file a ticket with them. See the following for a similar situation for the Scala (the issue here seems to be for Java instead): |
that makes sense. open https://issues.apache.org/jira/browse/KAFKA-18192 to handle it.
The root cause is that we set the compiler arguments directly instead of using Gradle's recommended |
JIRA: KAFKA-17811
This is sub-task to drop broker and tools support for Java 11.
Committer Checklist (excluded from commit message)