diff --git a/CHANGES.txt b/CHANGES.txt index 224e866abd..2f7657b49f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,8 @@ 3.11.18 Merged from 3.0: * Upgrade OWASP to 10.0.0 (CASSANDRA-19738) - +Merged from 2.2: + * Add termin-8-jdk as a valid jdk8 candidate in the debian package (CASSANDRA-19752) 3.11.17 * Move ClientWarn.State#warnings to a thread-safe list (CASSANDRA-19427) diff --git a/debian/control b/debian/control index 0a8bfd20ad..b1d5114078 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Maintainer: Eric Evans Uploaders: Sylvain Lebresne -Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python-dev (>= 2.7) | python2-dev (>= 2.7), dpatch, bash-completion +Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk | temurin-8-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python-dev (>= 2.7) | python2-dev (>= 2.7), dpatch, bash-completion Homepage: http://cassandra.apache.org Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git