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 705bce7b895b57cf2b5e42792ab3ad7a43e9303d..4c36e5634cd32cc38aad1407fab17c97b02a4a03 100644 (file)
--- 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>