From cd0a40d09e5c029e3cac260ecf4cb3dc02deabc7 Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Wed, 1 Jun 2022 15:13:34 -0500
Subject: [PATCH] Allow java 11 in redhat packaging

Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17669
---
 CHANGES.txt           | 1 +
 redhat/cassandra.spec | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 31c62caa57..a79117eac1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0.5
+ * Allow Java 11 to satisfy RPM/Debian packaging (CASSANDRA-17669)
  * Ensure FileStreamTask cannot compromise shared channel proxy for system table when interrupted (CASSANDRA-17663)
  * silence benign SslClosedEngineException (CASSANDRA-17565)
 Merged from 3.11:
diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec
index c1ff712594..4785262452 100644
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@ -46,7 +46,7 @@ BuildRoot:     %{_tmppath}/%{relname}root-%(%{__id_u} -n)
 BuildRequires: ant >= 1.9
 BuildRequires: ant-junit >= 1.9
 
-Requires:      jre >= 1.8.0
+Requires:      (jre-1.8.0 or jre-11)
 Requires:      python(abi) >= 3.6
 Requires:      procps-ng >= 3.3
 Requires(pre): user(cassandra)