openjdk-11 move, refactorings and cleanups

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

.java-version

@@ -1 +1 @@
-1.8
+11.0

.travis.yml

@@ -20,7 +20,7 @@ group: edge
 
 language: java
 jdk:
-  - openjdk8
+  - openjdk11
 python:
   - "2.7"
 

INSTALL.md

@@ -15,15 +15,8 @@ was tested against a CentOS 7 x86_64 setup.
 
 Install tools and dependencies used for development:
 
-    $ yum install git java-1.8.0-openjdk java-1.8.0-openjdk-devel \
-    mysql mysql-server mkisofs gcc python MySQL-python openssh-clients wget
-
-    # yum -y update
-    # yum -y install java-1.8.0-openjdk
-    # yum -y install java-1.8.0-openjdk-devel
-    # yum -y install mysql-server
-    # yum -y install git
-    # yum -y install genisoimage
+    # yum -y install git java-11-openjdk java-11-openjdk-devel \
+      mysql mysql-server mkisofs git gcc python MySQL-python openssh-clients wget
 
 Set up Maven (3.6.0):
 

debian/control

@@ -2,7 +2,7 @@ Source: cloudstack
 Section: libs
 Priority: extra
 Maintainer: Wido den Hollander <wido@widodh.nl>
-Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk | openjdk-9-jdk, genisoimage,
+Build-Depends: debhelper (>= 9), openjdk-11-jdk | java11-sdk | java11-jdk, genisoimage,
  python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), lsb-release, dh-systemd, python-setuptools
 Standards-Version: 3.8.1
 Homepage: http://www.cloudstack.org/
@@ -15,14 +15,14 @@ Description: A common package which contains files which are shared by several C
 
 Package: cloudstack-management
 Architecture: all
-Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, file, lsb-release, init-system-helpers (>= 1.14~)
+Depends: ${python:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, file, lsb-release, init-system-helpers (>= 1.14~)
 Conflicts: cloud-server, cloud-client, cloud-client-ui
 Description: CloudStack server library
  The CloudStack management server
 
 Package: cloudstack-agent
 Architecture: all
-Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), uuid-runtime, iproute2, ebtables, vlan, ipset, python-libvirt, ethtool, iptables, lsb-release, aria2
+Depends: ${python:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), uuid-runtime, iproute2, ebtables, vlan, ipset, python-libvirt, ethtool, iptables, lsb-release, aria2
 Recommends: init-system-helpers
 Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
 Description: CloudStack agent
@@ -32,7 +32,7 @@ Description: CloudStack agent
 
 Package: cloudstack-usage
 Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), libmysql-java, init-system-helpers
+Depends: openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless, cloudstack-common (= ${source:Version}), libmysql-java, init-system-helpers
 Description: CloudStack usage monitor
  The CloudStack usage monitor provides usage accounting across the entire cloud for
  cloud operators to charge based on usage parameters.

packaging/centos7/cloud.spec

@@ -38,7 +38,7 @@ Group:     System Environment/Libraries
 Source0:   %{name}-%{_maventag}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
 
-BuildRequires: java-1.8.0-openjdk-devel
+BuildRequires: java-11-openjdk-devel
 BuildRequires: ws-commons-util
 BuildRequires: jpackage-utils
 BuildRequires: gcc
@@ -53,7 +53,7 @@ intelligent IaaS cloud implementation.
 
 %package management
 Summary:   CloudStack management server UI
-Requires: java-1.8.0-openjdk
+Requires: java-11-openjdk
 Requires: python
 Requires: bash
 Requires: bzip2
@@ -92,7 +92,7 @@ The Apache CloudStack files shared between agent and management server
 %package agent
 Summary: CloudStack Agent for KVM hypervisors
 Requires: openssh-clients
-Requires: java-1.8.0-openjdk
+Requires: java-11-openjdk
 Requires: %{name}-common = %{_ver}
 Requires: libvirt
 Requires: bridge-utils
@@ -125,7 +125,7 @@ The CloudStack baremetal agent
 
 %package usage
 Summary: CloudStack Usage calculation server
-Requires: java-1.8.0-openjdk
+Requires: java-11-openjdk
 Requires: mysql-connector-java
 Group: System Environment/Libraries
 %description usage

pom.xml

@@ -51,7 +51,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- Build properties -->
-        <cs.jdk.version>1.8</cs.jdk.version>
+        <cs.jdk.version>11</cs.jdk.version>
         <cs.target.dir>target</cs.target.dir>
         <cs.replace.properties>build/replace.properties</cs.replace.properties>
 
@@ -136,6 +136,7 @@
         <cs.java-ipv6.version>0.16</cs.java-ipv6.version>
         <cs.javassist.version>3.22.0-GA</cs.javassist.version>
         <cs.javadoc.version>2.10.3</cs.javadoc.version>
+        <cs.javax.annotation.version>1.3.2</cs.javax.annotation.version>
         <cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
         <cs.jetty.version>9.4.8.v20171121</cs.jetty.version>
         <cs.jetty-maven-plugin.version>9.2.22.v20170606</cs.jetty-maven-plugin.version>

tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh

@@ -61,7 +61,7 @@ function install_packages() {
     ipvsadm conntrackd libnetfilter-conntrack3 \
     keepalived irqbalance \
     ipcalc \
-    openjdk-8-jre-headless \
+    openjdk-11-jre-headless \
     ipset \
     iptables-persistent \
     libtcnative-1 libssl-dev libapr1-dev \

tools/appliance/systemvmtemplate/template.json

@@ -38,8 +38,8 @@
       "disk_interface": "virtio",
       "net_device": "virtio-net",
 
-      "iso_url": "https://cdimage.debian.org/cdimage/archive/9.9.0/amd64/iso-cd/debian-9.9.0-amd64-netinst.iso",
-      "iso_checksum": "42d9818abc4a08681dc0638f07e7aeb35d0c44646ab1e5b05a31a71d76c99da52b6192db9a3e852171ac78c2ba6b110b337c0b562c7be3d32e86a105023a6a0c",
+      "iso_url": "https://cdimage.debian.org/cdimage/archive/10.0.0/amd64/iso-cd/debian-10.0.0-amd64-netinst.iso",
+      "iso_checksum": "d808985468652393cf31d30fe7d6f60f5041337980b25dd00f2ab9553248b564cf38174c8251f410ddbe221e57fefc78849f9879141e25a5dfb31d8043fccc5c",
       "iso_checksum_type": "sha512",
 
       "vm_name": "systemvmtemplate",

tools/docker/Dockerfile

@@ -30,7 +30,7 @@ RUN apt-get -y update && apt-get install -y \
     sudo \
     ipmitool \
     maven \
-    openjdk-8-jdk \
+    openjdk-11-jdk \
     python-dev \
     python-setuptools \
     python-pip \

tools/docker/Dockerfile.smokedev

@@ -30,7 +30,7 @@ RUN apt-get -y update && apt-get install -y \
     sudo \
     ipmitool \
     maven \
-    openjdk-8-jdk \
+    openjdk-11-jdk \
     python-dev \
     python-setuptools \
     python-pip \