From 3fdd99e60bce2e08d9495dc339cee3d941751dce Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 1 Jun 2022 15:12:55 -0500 Subject: [PATCH 1/2] Allow java 11 in Debian packaging Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17669 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 1fc3f96d3e..4ccaaaac2f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Maintainer: Eric Evans Uploaders: Sylvain Lebresne -Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), quilt, bash-completion +Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk | openjdk-11-jdk | java11-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), quilt, bash-completion Homepage: http://cassandra.apache.org Vcs-Git: https://gitbox.apache.org/repos/asf/cassandra.git Vcs-Browser: https://gitbox.apache.org/repos/asf?p=cassandra.git @@ -11,7 +11,7 @@ Standards-Version: 3.8.3 Package: cassandra Architecture: all -Depends: openjdk-8-jre-headless | java8-runtime, adduser, python3 (>= 3.6), procps, ${misc:Depends} +Depends: openjdk-8-jre-headless | java8-runtime | openjdk-11-jre-headless | java11-runtime, adduser, python3 (>= 3.6), procps, ${misc:Depends} Recommends: ntp | time-daemon Suggests: cassandra-tools Conflicts: apache-cassandra1 From cd0a40d09e5c029e3cac260ecf4cb3dc02deabc7 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 1 Jun 2022 15:13:34 -0500 Subject: [PATCH 2/2] 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)