KAFKA-17811: Separate modules to use different JDKs #17522
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
frankvicky
force-pushed
the
KAFKA-17811
branch
from
ce2af51
to
1807f63
Compare
chia7712
reviewed
Nov 17, 2024
| @@ -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.
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.
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.
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.
this need to be updated too.
frankvicky
force-pushed
the
KAFKA-17811
branch
from
3d9b01a
to
35bc484
Compare
chia7712
reviewed
Nov 22, 2024
|
|
||
| scalaCompileOptions.additionalParameters += ["-release", String.valueOf(minJavaVersion)] |
There was a problem hiding this comment.
streams-scala and streams:test-utils need java 11
chia7712
reviewed
Nov 22, 2024
| @@ -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.
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.
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.
def releaseVersion = modulesNeedingJava11.any { project.path == it } ? minClientJavaVersion : minServerJavaVersion
|
Hi @chia7712 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA: KAFKA-17811
This is sub-task to drop broker and tools support for Java 11.
Committer Checklist (excluded from commit message)