keycloak-aplcache

Merge pull request #4465 from vramik/KEYCLOAK-4793 KEYCLOAK-4793

9/11/2017 6:55:13 AM

Details

diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
index f3b3a69..57e2433 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
@@ -86,6 +86,7 @@
                 ${migration.import.properties}
                 ${auth.server.profile}
                 ${auth.server.feature}
+                ${kie.maven.settings}
             </property>
             <property name="javaVmArguments">
                 ${auth.server.jboss.jvm.debug.args}
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 7ad24de..d56f3e1 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -90,6 +90,8 @@
 
         <adapter.test.props/>
         <migration.import.properties/>
+        <kie.maven.settings/>
+        
         <examples.home>${project.build.directory}/examples</examples.home>
 
         <browser>htmlUnit</browser>
@@ -248,7 +250,8 @@
 
                             <adapter.test.props>${adapter.test.props}</adapter.test.props>
                             <migration.import.properties>${migration.import.properties}</migration.import.properties>
-
+                            <kie.maven.settings>${kie.maven.settings}</kie.maven.settings>
+                            
                             <testsuite.constants>${testsuite.constants}</testsuite.constants>
                             <cli.log.output>${cli.log.output}</cli.log.output>
                             <test.intermittent>${test.intermittent}</test.intermittent>
@@ -1256,6 +1259,25 @@
             </properties>
         </profile>
         
+        <profile>
+            <!--see KEYCLOAK-4793-->
+            <id>kie.maven.settings</id>
+            <activation>
+                <property>
+                    <name>repo.url</name>
+                </property>
+            </activation>
+            <properties>
+                <maven.repo.local>${user.home}/.m2/repository</maven.repo.local>
+                <settings.path>${user.home}/.m2/settings.xml</settings.path>
+                <kie.maven.settings>
+                    -Dkie.maven.settings.custom=${settings.path}
+                    -Dkie.maven.repo.local=${maven.repo.local}
+                    -Drepo.url=${repo.url}
+                </kie.maven.settings>
+            </properties>
+        </profile>
+        
     </profiles>
     
 </project>