Merge branch 'cassandra-2.2' into cassandra-3.0

* cassandra-2.2:
  Add termin-8-jdk as a valid jdk8 candidate in the debian package
This commit is contained in:
Mick Semb Wever 2024-07-05 16:39:03 +02:00
commit c485440de3
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 4 additions and 1 deletions

View File

@ -1,5 +1,8 @@
3.0.31
* 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.0.30
* Fix SCM URL link (CASSANDRA-19422)

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: misc
Priority: extra
Maintainer: Eric Evans <eevans@apache.org>
Uploaders: Sylvain Lebresne <slebresne@apache.org>
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