release: prepare for 3.2.5

release: prepare for 3.2.4
release: prepare for 3.2.3
2020-04-18 18:58:15 +03:00 · 2020-03-25 10:12:45 +02:00 · 2020-03-04 14:19:02 +02:00 · 2020-02-18 15:20:12 +02:00 · 2020-01-22 17:02:59 +02:00 · 2020-01-13 14:11:01 +02:00
4 changed files with 4 additions and 5 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 #!/bin/sh

 PRODUCT=scylla
-VERSION=666.development
+VERSION=3.2.5

 if test -f version
 then
--- a/dist/debian/control.mustache
+++ b/dist/debian/control.mustache
@ -7,7 +7,8 @@ Standards-Version: 3.9.5

 Package: {{product}}-jmx
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-8-jre-headless | openjdk-8-jre | oracle-java8-set-default, {{product}}-server
+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
 Description: Scylla JMX server binaries 
 Scylla is a highly scalable, eventually consistent, distributed,
 partitioned row DB.
--- a/dist/redhat/scylla-jmx.spec.mustache
+++ b/dist/redhat/scylla-jmx.spec.mustache
@ -41,6 +41,7 @@ fi

 %post
 %systemd_post scylla-jmx.service
+/usr/bin/systemctl daemon-reload ||:

 %preun
 %systemd_preun scylla-jmx.service
@ -60,7 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 /opt/scylladb/jmx/scylla-jmx
 /opt/scylladb/jmx/scylla-jmx-1.0.jar
 /opt/scylladb/jmx/symlinks/scylla-jmx
-/opt/scylladb/scripts/jmx

 %changelog
 * Fri Aug  7 2015 Takuya ASADA Takuya ASADA <syuu@cloudius-systems.com>
--- a/install.sh
+++ b/install.sh
@ -124,8 +124,6 @@ fi
 install -m644 scylla-jmx-1.0.jar "$rprefix/jmx"
 install -m755 scylla-jmx "$rprefix/jmx"
 ln -sf /usr/bin/java "$rprefix/jmx/symlinks/scylla-jmx"
-# create symlink for /usr/lib/scylla/jmx
-ln -srf $rprefix/jmx "$rprefix/scripts/"

 if $nonroot; then
    sed -i -e "s#/var/lib/scylla#$rprefix#g" "$rsysconfdir"/scylla-jmx
Author	SHA1	Message	Date
Hagit Segev	857e433a3a	release: prepare for 3.2.5	2020-04-18 18:58:15 +03:00
Hagit Segev	fe92124033	release: prepare for 3.2.4	2020-03-25 10:12:45 +02:00
Yaron Kaikov	6bce24c775	release: prepare for 3.2.3	2020-03-04 14:19:02 +02:00
Hagit Segev	7f5158d274	release: prepare for 3.2.2	2020-02-18 15:20:12 +02:00
Yaron Kaikov	63f45b1418	release: prepare for 3.2.1	2020-01-22 17:02:59 +02:00
Hagit Segev	83f8153b56	release: prepare for 3.2.0	2020-01-13 14:11:01 +02:00
Takuya ASADA	05d437893e	dist/redhat: call systemctl --daemon-reload when upgraded (#92 ) Since %systemd_post does not call systemctl --daemon-reload, we need to call it manually to apply changes. Fixes #90 (cherry picked from commit `29601254fc`)	2020-01-12 11:19:59 +02:00
Yaron Kaikov	0a404662d6	release: prepare for 3.2.rc4	2020-01-01 15:20:01 +02:00
Takuya ASADA	36acf7afb9	dist: drop symlink to scripts (#89 ) This is scylla-jmx part of https://github.com/scylladb/scylla/pull/5530 After we stopped replacing /usr/lib/scylla with symlink, creating symlink on /opt/scylladb/scripts/jmx become meaningless, so we can drop it now. We able to introduce new symlink on /usr/lib/scylla, but it likely no user directly invoke scripts under /usr/lib/scylla/jmx, so we don't have to do that. (cherry picked from commit `4c8660d41a`)	2019-12-30 22:03:40 +02:00
Takuya ASADA	f2fc1b912c	dist/debian: add AdoptOpenJDK for Debian 10 Since Debian 10 dropped OpenJDK 8, so we need to switch to other JVM distribution which still maintain OpenJDK 8 for Debian. We can use AdoptOpenJDK for such environment. See scylladb/scylla#5463 Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <20191218124838.35017-1-syuu@scylladb.com> (cherry picked from commit `2f34a97c6e`)	2019-12-26 13:53:39 +02:00
Takuya ASADA	ebb3c1e8a4	dist/debian: add Conflicts with openjdk-11 Since Debian variants can install multiple JRE, "Depends: openjdk-8-jre" may not mean default JRE is openjdk-8. We should block openjdk-11 for now, until we support it. Related with scylladb/scylla#5463 Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <20191218111835.25618-1-syuu@scylladb.com> (cherry picked from commit `236ffa6c98`)	2019-12-26 13:53:32 +02:00
Hagit Segev	811a00ad9a	release: prepare for 3.2.rc3	2019-12-15 10:33:29 +02:00
Hagit Segev	32ae0a0d0a	release: prepare for 3.2.rc2	2019-12-03 18:16:52 +02:00
Hagit Segev	bc2b9aa67d	release: prepare for 3.2.rc1	2019-11-19 21:38:41 +02:00
Yaron Kaikov	021ddd059d	release: prepare for 3.2.rc0	2019-11-17 16:08:21 +02:00