Skip to content

Commit 4621dfe

Browse files
Add support for java 21 in preparation for CASSANDRA-18831
patch by Mick Semb Wever; reviewed by Dmitry Konstantinov for CASSANDRA-18831
1 parent 821eff3 commit 4621dfe

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

ccmlib/common.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,11 @@ def _update_java_version(current_java_version, current_java_home_version,
948948

949949
def assert_jdk_valid_for_cassandra_version(cassandra_version, env=None):
950950
jdk_version = float(get_jdk_version(env=env))
951-
if cassandra_version >= '4.2':
951+
if cassandra_version >= '5.1':
952+
if jdk_version < 11 or 11 < jdk_version < 17 or 17 < jdk_version < 21 or 21 < jdk_version:
953+
error('Cassandra {} requires Java 11 or Java 17 or Java 21, found Java {}'.format(cassandra_version, jdk_version))
954+
exit(1)
955+
elif cassandra_version >= '4.2':
952956
if jdk_version < 11 or 11 < jdk_version < 17 or 17 < jdk_version:
953957
error('Cassandra {} requires Java 11 or Java 17, found Java {}'.format(cassandra_version, jdk_version))
954958
exit(1)

0 commit comments

Comments
 (0)