Skip to content

Commit

Permalink
cloudstack: add JDK11 support (apache#3601)
Browse files Browse the repository at this point in the history
This adds support for JDK11 in CloudStack 4.14+:

- Fixes code to build against JDK11
- Bump to Debian 9 systemvmtemplate with openjdk-11
- Fix Travis to run smoketests against openjdk-11
- Use maven provided jdk11 compatible mysql-connector-java
- Remove old agent init.d scripts

Signed-off-by: Rohit Yadav <[email protected]>
  • Loading branch information
rohityadavcloud authored Feb 12, 2020
1 parent ccda5fb commit d90341e
Show file tree
Hide file tree
Showing 185 changed files with 1,983 additions and 3,242 deletions.
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8
11.0
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

sudo: required
dist: xenial
group: edge
dist: bionic
group: stable

language: java

jdk:
- openjdk8
- openjdk11

python:
- "2.7"

Expand All @@ -46,6 +49,7 @@ env:
smoke/test_create_list_domain_account_project
smoke/test_create_network
smoke/test_deploy_vgpu_enabled_vm
smoke/test_deploy_vm_extra_config_data
smoke/test_deploy_vm_iso
smoke/test_deploy_vm_root_resize
smoke/test_deploy_vm_with_userdata
Expand Down Expand Up @@ -153,6 +157,7 @@ env:
component/test_project_resources"

- TESTS="component/test_project_usage
component/test_protocol_number_security_group
component/test_resource_limits"

- TESTS="component/test_regions_accounts
Expand Down
11 changes: 2 additions & 9 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down
119 changes: 0 additions & 119 deletions agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in

This file was deleted.

119 changes: 0 additions & 119 deletions agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in

This file was deleted.

Loading

0 comments on commit d90341e

Please sign in to comment.