From 730314fec1e60da161ee962c521767fca968aeac Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Tue, 21 Apr 2015 20:27:27 -0400
Subject: [PATCH 1/2] Execute tests with $JAVA_HOME.

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 772d7ef6578..d28060f8cd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
         <tests.heap.size>512m</tests.heap.size>
         <tests.heapdump.path>${basedir}/logs/</tests.heapdump.path>
         <tests.topn>5</tests.topn>
+        <jvm.executable>${java.home}${file.separator}bin${file.separator}java</jvm.executable>
         <execution.hint.file>.local-${project.version}-execution-hints.log</execution.hint.file>
 
         <!-- Properties used for building RPM & DEB packages (see common/packaging.properties) -->
@@ -444,7 +445,7 @@
               </execution>
             </executions>
             <configuration>
-              <executable>java</executable>
+              <executable>${jvm.executable></executable>
               <arguments>
                 <argument>-classpath</argument>
                 <classpath/>
@@ -516,6 +517,7 @@
                             <goal>junit4</goal>
                         </goals>
                         <configuration>
+                            <jvm>${jvm.executable}</jvm>
                             <heartbeat>10</heartbeat>
                             <jvmOutputAction>pipe,warn</jvmOutputAction>
                             <leaveTemporary>true</leaveTemporary>

From 9406d834417a7a3a8b11fc3d7e1166eefd0dd4ac Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 22 Apr 2015 08:46:14 -0400
Subject: [PATCH 2/2] fix typo

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d28060f8cd7..2a5773b4594 100644
--- a/pom.xml
+++ b/pom.xml
@@ -445,7 +445,7 @@
               </execution>
             </executions>
             <configuration>
-              <executable>${jvm.executable></executable>
+              <executable>${jvm.executable}</executable>
               <arguments>
                 <argument>-classpath</argument>
                 <classpath/>