From d5d1efd1887e9d976e8eeaba59684aa6fab2719c Mon Sep 17 00:00:00 2001 From: Yaron Kaikov Date: Sun, 23 Aug 2020 23:08:17 +0300 Subject: [PATCH] dist/debian: Remove conflict tag for Java 11 We current require Java 8 to install the scylla-jmx package on Debian. As Debian 10 defaults to Java 11, let's remove the conflict flag and add Java 11 to the dependencies list. --- dist/debian/control.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dist/debian/control.template b/dist/debian/control.template index 1564e91..be3b61e 100644 --- a/dist/debian/control.template +++ b/dist/debian/control.template @@ -8,8 +8,7 @@ Rules-Requires-Root: no Package: %{product}-jmx Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-8-jre-headless | openjdk-8-jre | oracle-java8-set-default | adoptopenjdk-8-hotspot-jre, %{product}-server -Conflicts: openjdk-11-jre-headless, openjdk-11-jre, oracle-java11-set-default +Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-8-jre-headless | openjdk-8-jre | oracle-java8-set-default | adoptopenjdk-8-hotspot-jre | openjdk-11-jre-headless | openjdk-11-jre |oracle-java11-set-default , %{product}-server Description: Scylla JMX server binaries Scylla is a highly scalable, eventually consistent, distributed, partitioned row DB.