Skip to content

Commit

Permalink
Fix get_supported_jdk_versions to work on 5.0+ binary installs
Browse files Browse the repository at this point in the history
 patch by Mick Semb Wever; reviewed by Brandon Williams, Ekaterina Dimitrova for CASSANDRA-18832
  • Loading branch information
michaelsembwever committed Sep 12, 2023
1 parent cdc5efa commit d9c6779
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions ccmlib/common.py
Expand Up @@ -923,9 +923,15 @@ def _update_java_version(current_java_version, current_java_home_version,
.format(info_message, current_java_version, current_java_home_version, jvm_version, for_build,
cassandra_version, install_dir, env))

# this won't work with DSE versions
if cassandra_version >= '4.2':
build_versions = get_supported_jdk_versions(install_dir)
run_versions = get_supported_jdk_versions(install_dir)
if os.path.exists(os.path.join(install_dir, 'build.xml')):
build_versions = get_supported_jdk_versions(install_dir)
run_versions = get_supported_jdk_versions(install_dir)
else:
# binary installs we don't know which jdks are supported any more
build_versions = [current_java_version]
run_versions = [current_java_version]

if '4.0' <= cassandra_version < '4.2':
if not os_env:
Expand Down

0 comments on commit d9c6779

Please sign in to comment.