From a2ad9bb22152b7f38e42cb836c539595883ee207 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Mon, 26 Oct 2015 23:41:16 +0900 Subject: [PATCH] dist: use OpenJDK-7 on CentOS --- dist/redhat/scripts/jmx_run | 2 +- dist/redhat/scylla-jmx.spec.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/redhat/scripts/jmx_run b/dist/redhat/scripts/jmx_run index 22c5762..1970488 100755 --- a/dist/redhat/scripts/jmx_run +++ b/dist/redhat/scripts/jmx_run @@ -2,4 +2,4 @@ args="-Djava.net.preferIPv4Stack=true -Dcom.sun.management.jmxremote.port=$JMX_LOCAL_PORT -Dcom.sun.management.jmxremote.rmi.port=$JMX_LOCAL_PORT -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" -exec /usr/lib/jvm/jre-1.8.0/bin/java $args -jar /usr/lib/scylla/jmx/urchin-mbean-1.0.jar +exec java $args -jar /usr/lib/scylla/jmx/urchin-mbean-1.0.jar diff --git a/dist/redhat/scylla-jmx.spec.in b/dist/redhat/scylla-jmx.spec.in index ec3dd3e..8b2059d 100644 --- a/dist/redhat/scylla-jmx.spec.in +++ b/dist/redhat/scylla-jmx.spec.in @@ -9,8 +9,8 @@ URL: http://www.scylladb.com/ Source0: %{name}-@@VERSION@@-@@RELEASE@@.tar BuildArch: noarch -BuildRequires: maven java-1.8.0-openjdk-devel systemd-units -Requires: java-1.8.0-openjdk scylla-server +BuildRequires: maven systemd-units java-devel +Requires: scylla-server java-headless %description @@ -20,7 +20,7 @@ Requires: java-1.8.0-openjdk scylla-server %build -env JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk mvn install +mvn install %install rm -rf $RPM_BUILD_ROOT