Browse code

Merge "Use java version independent package on Ubuntu"

Jenkins authored on 2016/12/20 09:59:56
Showing 2 changed files
... ...
@@ -2,6 +2,7 @@ bc
2 2
 bridge-utils
3 3
 bsdmainutils
4 4
 curl
5
+default-jre-headless  # NOPRIME
5 6
 g++
6 7
 gcc
7 8
 gettext  # used for compiling message catalogs
... ...
@@ -17,7 +18,6 @@ libxml2-dev  # lxml
17 17
 libxslt1-dev  # lxml
18 18
 libyaml-dev
19 19
 lsof # useful when debugging
20
-openjdk-7-jre-headless  # NOPRIME
21 20
 openssh-server
22 21
 openssl
23 22
 pkg-config
... ...
@@ -83,7 +83,7 @@ function install_elasticsearch {
83 83
         return
84 84
     fi
85 85
     if is_ubuntu; then
86
-        is_package_installed openjdk-7-jre-headless || install_package openjdk-7-jre-headless
86
+        is_package_installed default-jre-headless || install_package default-jre-headless
87 87
 
88 88
         sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb
89 89
         sudo update-rc.d elasticsearch defaults 95 10