From f52d7bef76e0809e2dce920fe0e5b08c5378535c Mon Sep 17 00:00:00 2001
From: vmuzikar <vmuzikar@redhat.com>
Date: Wed, 5 Dec 2018 15:41:00 +0100
Subject: [PATCH] KEYCLOAK-9025 Respect app.server.java.home while installing
 adapters

---
 .../servers/app-server/jboss/pom.xml          | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml
index 461b98ea4c..78bb26a8af 100644
--- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml
@@ -268,6 +268,9 @@
                                     <skip>${skip.apply.offline.cli}</skip><!--eap6-->
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${common.resources}/cli/add-adapter-log-level.cli</argument>
                                         <!--
@@ -289,6 +292,9 @@
                                     <skip>${skip.apply.offline.cli}</skip><!--eap6-->
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${common.resources}/cli/add-adapter-log-level.cli</argument>
                                         <!--
@@ -313,6 +319,9 @@
                                     <skip>${skip.elytron.adapter.installation}</skip>
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${app.server.jboss.home}/bin/adapter-elytron-install-offline.cli</argument>
                                         <!--
@@ -335,6 +344,9 @@
                                     <skip>${skip.elytron.adapter.installation}</skip>
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${app.server.jboss.home}/bin/adapter-elytron-install-offline.cli</argument>
                                         <!--
@@ -358,6 +370,9 @@
                                     <skip>${skip.elytron.adapter.installation}</skip>
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${app.server.jboss.home}/bin/adapter-elytron-install-saml-offline.cli</argument>
                                         <!--
@@ -380,6 +395,9 @@
                                     <skip>${skip.elytron.adapter.installation}</skip>
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${app.server.jboss.home}/bin/adapter-elytron-install-saml-offline.cli</argument>
                                         <!--
@@ -404,6 +422,9 @@
                                     <skip>${skip.adapter.offline.installation}</skip>
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${app.server.jboss.home}/bin/adapter-install-offline.cli</argument>
                                         <!--
@@ -426,6 +447,9 @@
                                     <skip>${skip.adapter.offline.installation}</skip>
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${app.server.jboss.home}/bin/adapter-install-offline.cli</argument>
                                         <!--
@@ -449,6 +473,9 @@
                                     <skip>${skip.adapter.offline.installation}</skip>
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${app.server.jboss.home}/bin/adapter-install-saml-offline.cli</argument>
                                         <!--
@@ -471,6 +498,9 @@
                                     <skip>${skip.adapter.offline.installation}</skip>
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${app.server.jboss.home}/bin/adapter-install-saml-offline.cli</argument>
                                         <!--
@@ -493,6 +523,9 @@
                                     <skip>${skip.apply.offline.cli}</skip><!--eap6-->
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${common.resources}/cli/add-secured-deployments.cli</argument>
                                         <!--
@@ -515,6 +548,9 @@
                                     <skip>${skip.configure.clustered.scenario}</skip><!--eap6, wildfly9-->
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${common.resources}/cli/configure-cluster-config.cli</argument>
                                         <!--
@@ -537,6 +573,9 @@
                                     <skip>${skip.configure.clustered.scenario}</skip><!--eap6, wildfly9-->
                                     <executable>${cli.executable}</executable>
                                     <workingDirectory>${cli.working.dir}</workingDirectory>
+                                    <environmentVariables>
+                                        <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+                                    </environmentVariables>
                                     <arguments>
                                         <argument>--file=${common.resources}/cli/configure-crossdc-config.cli</argument>
                                         <!--