diff --git a/CHANGES.txt b/CHANGES.txt index 2e7772bf89..d26de18151 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,7 @@ * Revert removal of withBufferSizeInMB(int size) in CQLSSTableWriter.Builder class and deprecate it in favor of withBufferSizeInMiB(int size) (CASSANDRA-17675) * Remove expired snapshots of dropped tables after restart (CASSANDRA-17619) Merged from 4.0: + * 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/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 diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec index a3abaa6ece..7431c1cd8e 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)