Skip to content

Commit 14ebec3

Browse files
authored
MINOR: Update release script for 4.0 (apache#18999)
This patch updates the release script to use JDK 21 to build the release. We could also use JDK 17 but using JDK 21 directly does not change much. We have to verify anyway that the server works with 17 and the client with 11. Reviewers: Ismael Juma <[email protected]>
1 parent 118818a commit 14ebec3

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

release/release.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ def command_stage_docs():
127127
if not os.path.exists(kafka_site_repo_path) or not os.path.exists(os.path.join(kafka_site_repo_path, "powered-by.html")):
128128
fail("{kafka_site_repo_path} doesn't exist or does not appear to be the kafka-site repository")
129129

130-
jdk17_env = get_jdk(17)
130+
jdk21_env = get_jdk(21)
131131

132132
# We explicitly override the version of the project that we normally get from gradle.properties since we want to be
133133
# able to run this from a release branch where we made some updates, but the build would show an incorrect SNAPSHOT
134134
# version due to already having bumped the bugfix version number.
135135
gradle_version_override = detect_docs_release_version(project_version)
136136

137-
cmd("Building docs", f"./gradlew -Pversion={gradle_version_override} clean siteDocsTar aggregatedJavadoc", cwd=repo_dir, env=jdk17_env)
137+
cmd("Building docs", f"./gradlew -Pversion={gradle_version_override} clean siteDocsTar aggregatedJavadoc", cwd=repo_dir, env=jdk21_env)
138138

139139
docs_tar = os.path.join(repo_dir, "core", "build", "distributions", f"kafka_2.13-{gradle_version_override}-site-docs.tgz")
140140

@@ -229,8 +229,7 @@ def verify_gpg_key():
229229
preferences.once(f"verify_gpg_key_{gpg_key_pass_id}", verify_gpg_key)
230230

231231
apache_id = preferences.get('apache_id', lambda: prompt("Please enter your apache-id: "))
232-
jdk8_env = get_jdk(8)
233-
jdk17_env = get_jdk(17)
232+
jdk21_env = get_jdk(21)
234233

235234

236235
def verify_prerequeisites():
@@ -328,9 +327,9 @@ def delete_gitrefs():
328327

329328

330329
git.targz(rc_tag, f"kafka-{release_version}-src/", f"{artifacts_dir}/kafka-{release_version}-src.tgz")
331-
cmd("Building artifacts", "./gradlew clean && ./gradlew releaseTarGz -PscalaVersion=2.13", cwd=kafka_dir, env=jdk8_env, shell=True)
330+
cmd("Building artifacts", "./gradlew clean && ./gradlew releaseTarGz -PscalaVersion=2.13", cwd=kafka_dir, env=jdk21_env, shell=True)
332331
cmd("Copying artifacts", f"cp {kafka_dir}/core/build/distributions/* {artifacts_dir}", shell=True)
333-
cmd("Building docs", "./gradlew clean aggregatedJavadoc", cwd=kafka_dir, env=jdk17_env)
332+
cmd("Building docs", "./gradlew clean aggregatedJavadoc", cwd=kafka_dir, env=jdk21_env)
334333
cmd("Copying docs", f"cp -R {kafka_dir}/build/docs/javadoc {artifacts_dir}")
335334

336335
for filename in os.listdir(artifacts_dir):
@@ -355,8 +354,8 @@ def delete_gitrefs():
355354
svn.commit_artifacts(rc_tag, artifacts_dir, work_dir)
356355

357356
confirm_or_fail("Going to build and upload mvn artifacts based on these settings:\n" + textfiles.read(global_gradle_props) + '\nOK?')
358-
cmd("Building and uploading archives", "./gradlew publish -PscalaVersion=2.13", cwd=kafka_dir, env=jdk8_env, shell=True)
359-
cmd("Building and uploading archives", "mvn deploy -Pgpg-signing", cwd=os.path.join(kafka_dir, "streams/quickstart"), env=jdk8_env, shell=True)
357+
cmd("Building and uploading archives", "./gradlew publish -PscalaVersion=2.13", cwd=kafka_dir, env=jdk21_env, shell=True)
358+
cmd("Building and uploading archives", "mvn deploy -Pgpg-signing", cwd=os.path.join(kafka_dir, "streams/quickstart"), env=jdk21_env, shell=True)
360359

361360
# TODO: Many of these suggested validation steps could be automated
362361
# and would help pre-validate a lot of the stuff voters test

0 commit comments

Comments
 (0)