From 31aede327568f15f0004a5c30fb10f508587309b Mon Sep 17 00:00:00 2001 From: Jackson Fleming Date: Tue, 19 Sep 2023 10:31:24 +0200 Subject: [PATCH] Enable 3rd party JDK installations for Debian package java11-runtime and java8-runtime for Cassandra 4.x branches and java17-runtime with java11-runtime for Cassandra 5.x branches enable users to use arbitrary JDK installation if it provides such runtime by installing it from 3rd-party repositories. By specifying only OpenJDK-based packages in Depends in debian/control file, it was not possible to use other JDKs but that one. patch by Jackson Fleming; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18844 --- CHANGES.txt | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 62c49d6fd0..13de2ab602 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0.12 + * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844) * Fix NTS log message when an unrecognized strategy option is passed (CASSANDRA-18679) * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582) * Migrate Python optparse to argparse (CASSANDRA-17914) diff --git a/debian/control b/debian/control index 4ccaaaac2f..01401b9868 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 | openjdk-11-jdk | java11-jdk, ant (>= 1.9), ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), quilt, bash-completion +Build-Depends: debhelper (>= 11), openjdk-8-jdk-headless | openjdk-11-jdk-headless | java8-jdk | java11-jdk, ant (>= 1.10), ant-optional (>= 1.10), 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 | openjdk-11-jre-headless | java11-runtime, adduser, python3 (>= 3.6), procps, ${misc:Depends} +Depends: openjdk-11-jre-headless | openjdk-8-jre-headless | java11-runtime | java8-runtime, adduser, python3 (>= 3.6), procps, ${misc:Depends} Recommends: ntp | time-daemon Suggests: cassandra-tools Conflicts: apache-cassandra1