From 4d7410620cae5774893a62125e8581af38cfca29 Mon Sep 17 00:00:00 2001 From: Khai Do Date: Fri, 21 Feb 2014 10:32:37 -0800 Subject: [PATCH] make ant use java 7 The ant build tool has a package and runtime dependency on java 6. The runtime dependency can be changed by setting JAVA_HOME. This change sets the ant runtime dependency to java 7. Change-Id: I5d2ac7fb3dc7bdb390edcc728b86a84c946f8752 --- .../files/jenkins_job_builder/config/macros.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index d9a0f234dd..50780a3112 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -249,6 +249,8 @@ git clone https://gerrit.googlesource.com/buck cd buck git checkout 274acb17e9b6dc9ee60bc1371c47a7f49640c24c + # ant on precise depends on java6, so need to override with java7 + export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 ant fi