From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 29 Oct 2013 16:12:17 +0000 (-0700)
Subject: Fixed sanitytest to always use the same java and JAVA_HOME as maven.
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~538
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b7b86aeb8653c574824cf08c92073ffc4d3aa396;hp=b6c2242e7aee78b607ab0bc29a08b3686c4034ca

Fixed sanitytest to always use the same java and JAVA_HOME as maven.

Change-Id: I51d17678614d5df1ebd6d11394ebca6266749f01
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 705bce7b89..4c36e5634c 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -1245,12 +1245,17 @@
           </execution>
         </executions>
           <configuration>
-            <executable>java</executable>
+            <executable>${java.home}/bin/java</executable>
             <arguments>
                 <argument>-cp</argument>
                 <argument>./target/dependency/*</argument>
                 <argument>org.opendaylight.controller.distribution.Sanity</argument>
             </arguments>
+            <environmentVariables>
+              <JAVA_HOME>
+                ${java.home}
+              </JAVA_HOME>
+            </environmentVariables>
           </configuration>
       </plugin>
     </plugins>