@@ -127,14 +127,14 @@ def command_stage_docs():
127
127
if not os .path .exists (kafka_site_repo_path ) or not os .path .exists (os .path .join (kafka_site_repo_path , "powered-by.html" )):
128
128
fail ("{kafka_site_repo_path} doesn't exist or does not appear to be the kafka-site repository" )
129
129
130
- jdk17_env = get_jdk (17 )
130
+ jdk21_env = get_jdk (21 )
131
131
132
132
# We explicitly override the version of the project that we normally get from gradle.properties since we want to be
133
133
# able to run this from a release branch where we made some updates, but the build would show an incorrect SNAPSHOT
134
134
# version due to already having bumped the bugfix version number.
135
135
gradle_version_override = detect_docs_release_version (project_version )
136
136
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 )
138
138
139
139
docs_tar = os .path .join (repo_dir , "core" , "build" , "distributions" , f"kafka_2.13-{ gradle_version_override } -site-docs.tgz" )
140
140
@@ -229,8 +229,7 @@ def verify_gpg_key():
229
229
preferences .once (f"verify_gpg_key_{ gpg_key_pass_id } " , verify_gpg_key )
230
230
231
231
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 )
234
233
235
234
236
235
def verify_prerequeisites ():
@@ -328,9 +327,9 @@ def delete_gitrefs():
328
327
329
328
330
329
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 )
332
331
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 )
334
333
cmd ("Copying docs" , f"cp -R { kafka_dir } /build/docs/javadoc { artifacts_dir } " )
335
334
336
335
for filename in os .listdir (artifacts_dir ):
@@ -355,8 +354,8 @@ def delete_gitrefs():
355
354
svn .commit_artifacts (rc_tag , artifacts_dir , work_dir )
356
355
357
356
confirm_or_fail ("Going to build and upload mvn artifacts based on these settings:\n " + textfiles .read (global_gradle_props ) + '\n OK?' )
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 )
360
359
361
360
# TODO: Many of these suggested validation steps could be automated
362
361
# and would help pre-validate a lot of the stuff voters test
0 commit comments