[java-idp-integration-tests] branch master updated: Prefer running the IdP with Java located at idp.java.home to java.home

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch master
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=950db67fc5b2944b35170fc77a26322354b5affe

The following commit(s) were added to refs/heads/master by this push:
       new  950db67   Prefer running the IdP with Java located at idp.java.home to java.home
950db67 is described below

commit 950db67fc5b2944b35170fc77a26322354b5affe
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Fri Mar 8 09:17:31 2019 -0600

    Prefer running the IdP with Java located at idp.java.home to java.home
---
 src/test/java/net/shibboleth/idp/test/JettyServerProcess.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java b/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java
index 0a2d565..4878d7c 100644
--- a/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java
+++ b/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java
@@ -56,7 +56,9 @@ public class JettyServerProcess extends AbstractServerProcess {
         getProcessBuilder().environment().put("JETTY_BASE", getServletContainerBasePath().toAbsolutePath().toString());
 
         // Start Jetty via start.jar
-        final Path pathToJava = Paths.get(System.getProperty("java.home"), "bin", "java");
+        // Prefer Java located at idp.java.home system property
+        final Path pathToJava = Paths.get(System.getProperty("idp.java.home", System.getProperty("java.home")), "bin", "java");
+        log.debug("Will use Java located at '{}'", pathToJava);
         getCommands().add(pathToJava.toAbsolutePath().toString());
         getCommands().add("-jar");
         getCommands().add(getServletContainerHomePath().toAbsolutePath().toString() + "/start.jar");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.