Skip to content

Commit e6cc78f

Browse files
yadvryadvr
committed
CLOUDSTACK-9710: Switch to JRE1.8
- Switches Travis to use jdk1.8 - Changes java-version to 1.8 - Change jdk/maven version to 1.8 - Switch to F5/java8 compatible library release - Switch packaging to use jdk 1.8, and jre 1.8 in init/systemd scripts - Switch systemvm to openjdk-8-jre Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 729ae6d commit e6cc78f

19 files changed

Lines changed: 55 additions & 34 deletions

File tree

‎.java-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7
1+
1.8

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sudo: required
1818
dist: trusty
1919
language: java
2020
jdk:
21-
- oraclejdk7
21+
- oraclejdk8
2222
python:
2323
- "2.7"
2424
cache:

‎debian/control‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: cloudstack
22
Section: libs
33
Priority: extra
44
Maintainer: Wido den Hollander <wido@widodh.nl>
5-
Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk | openjdk-7-jdk, genisoimage,
5+
Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk, genisoimage,
66
python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), lsb-release, dh-systemd
77
Standards-Version: 3.8.1
88
Homepage: http://www.cloudstack.org/
@@ -15,14 +15,14 @@ Description: A common package which contains files which are shared by several C
1515

1616
Package: cloudstack-management
1717
Architecture: all
18-
Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6 | tomcat7, sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release
18+
Depends: ${misc:Depends}, ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), tomcat6 | tomcat7, sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release
1919
Conflicts: cloud-server, cloud-client, cloud-client-ui
2020
Description: CloudStack server library
2121
The CloudStack management server
2222

2323
Package: cloudstack-agent
2424
Architecture: all
25-
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-7-jre-headless, cloudstack-common (= ${source:Version}), lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm (>= 1.0), libvirt-bin (>= 0.9.8), uuid-runtime, iproute, ebtables, vlan, jsvc, ipset, python-libvirt, ethtool, iptables, lsb-release
25+
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm (>= 1.0), libvirt-bin (>= 0.9.8), uuid-runtime, iproute, ebtables, vlan, jsvc, ipset, python-libvirt, ethtool, iptables, lsb-release
2626
Recommends: init-system-helpers
2727
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
2828
Description: CloudStack agent
@@ -32,7 +32,7 @@ Description: CloudStack agent
3232

3333
Package: cloudstack-usage
3434
Architecture: all
35-
Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-7-jre-headless, cloudstack-common (= ${source:Version}), jsvc, libmysql-java
35+
Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), jsvc, libmysql-java
3636
Recommends: init-system-helpers
3737
Description: CloudStack usage monitor
3838
The CloudStack usage monitor provides usage accounting across the entire cloud for

‎engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public interface NetworkOrchestrationService {
6565
static final String NetworkThrottlingRateCK = "network.throttling.rate";
6666
static final String MinVRVersionCK = "minreq.sysvmtemplate.version";
6767

68-
static final ConfigKey<String> MinVRVersion = new ConfigKey<String>(String.class, MinVRVersionCK, "Advanced", "4.6.0",
68+
static final ConfigKey<String> MinVRVersion = new ConfigKey<String>(String.class, MinVRVersionCK, "Advanced", "4.10.0",
6969
"What version should the Virtual Routers report", true, ConfigKey.Scope.Zone, null);
7070

7171
static final ConfigKey<Integer> NetworkLockTimeout = new ConfigKey<Integer>(Integer.class, NetworkLockTimeoutCK, "Network", "600",

‎packaging/build-deb.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ set -e
3737
# docker run -ti -v /tmp:/src ubuntu:16.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-8-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh"
3838
#
3939
# Ubuntu 14.04
40-
# docker run -ti -v /tmp:/src ubuntu:14.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-7-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh"
40+
# docker run -ti -v /tmp:/src ubuntu:14.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-8-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh"
4141
#
4242

4343
cd `dirname $0`

‎packaging/centos63/cloud-agent.rc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ unset OPTIONS
4949
[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
5050

5151
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
52-
JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
52+
JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-1.8.0 /usr/lib/jvm/java-8-openjdk /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-openjdk-amd64"
5353

5454
for jdir in $JDK_DIRS; do
5555
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then

‎packaging/centos63/cloud.spec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Group: System Environment/Libraries
4343
Source0: %{name}-%{_maventag}.tgz
4444
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
4545

46-
BuildRequires: java-1.7.0-openjdk-devel
46+
BuildRequires: java-1.8.0-openjdk-devel
4747
BuildRequires: tomcat6
4848
BuildRequires: ws-commons-util
4949
BuildRequires: jpackage-utils
@@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
6060
%package management
6161
Summary: CloudStack management server UI
6262
Requires: tomcat6
63-
Requires: java-1.7.0-openjdk
63+
Requires: java-1.8.0-openjdk
6464
Requires: python
6565
Requires: bash
6666
Requires: bzip2
@@ -113,7 +113,7 @@ The Apache CloudStack files shared between agent and management server
113113
%package agent
114114
Summary: CloudStack Agent for KVM hypervisors
115115
Requires: openssh-clients
116-
Requires: java-1.7.0-openjdk
116+
Requires: java-1.8.0-openjdk
117117
Requires: %{name}-common = %{_ver}
118118
Requires: libvirt
119119
Requires: bridge-utils
@@ -152,7 +152,7 @@ The CloudStack baremetal agent
152152

153153
%package usage
154154
Summary: CloudStack Usage calculation server
155-
Requires: java-1.7.0-openjdk
155+
Requires: java-1.8.0-openjdk
156156
Requires: jsvc
157157
Requires: jakarta-commons-daemon
158158
Requires: jakarta-commons-daemon-jsvc

‎packaging/centos7/cloud-agent.rc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ unset OPTIONS
4949
[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
5050

5151
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
52-
JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
52+
JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-1.8.0-openjdk /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-openjdk-amd64"
5353

5454
for jdir in $JDK_DIRS; do
5555
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then

‎packaging/centos7/cloud.spec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Group: System Environment/Libraries
4343
Source0: %{name}-%{_maventag}.tgz
4444
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
4545

46-
BuildRequires: java-1.7.0-openjdk-devel
46+
BuildRequires: java-1.8.0-openjdk-devel
4747
BuildRequires: tomcat => 7.0
4848
BuildRequires: ws-commons-util
4949
BuildRequires: jpackage-utils
@@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
6060
%package management
6161
Summary: CloudStack management server UI
6262
Requires: tomcat => 7.0
63-
Requires: java => 1.7.0
63+
Requires: java => 1.8.0
6464
Requires: python
6565
Requires: bash
6666
Requires: bzip2
@@ -99,7 +99,7 @@ The Apache CloudStack files shared between agent and management server
9999
%package agent
100100
Summary: CloudStack Agent for KVM hypervisors
101101
Requires: openssh-clients
102-
Requires: java => 1.7.0
102+
Requires: java => 1.8.0
103103
Requires: %{name}-common = %{_ver}
104104
Requires: libvirt
105105
Requires: bridge-utils
@@ -131,7 +131,7 @@ The CloudStack baremetal agent
131131

132132
%package usage
133133
Summary: CloudStack Usage calculation server
134-
Requires: java => 1.7.0
134+
Requires: java => 1.8.0
135135
Requires: mysql-connector-java
136136
Group: System Environment/Libraries
137137
%description usage

‎packaging/debian/cloudstack-agent.init‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ unset OPTIONS
5050
mkdir -m 0755 -p "$TMP"
5151

5252
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
53-
JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
53+
JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-oracle"
5454

5555
for jdir in $JDK_DIRS; do
5656
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then

0 commit comments

Comments
 (0)