Merge remote-tracking branch 'upstream/master' into client-storage-spi

testsuite/integration-arquillian/servers/app-server/jboss/common/install-adapters.bat

@@ -23,13 +23,48 @@ goto wait_for_jboss
 
 :install_adapters
 call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-install.cli"
-if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
+set ERROR=%ERRORLEVEL%
-if "%SAML_SUPPORTED%" == "true" (
+echo Installation of OIDC adapter ended with error code: "%ERROR%"
-    call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-install-saml.cli"
+if %ERROR% neq 0 (
-    if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
+    goto shutdown_jboss
+)
+
+if "%ELYTRON_SUPPORTED%" == "true" (
+    call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-elytron-install.cli"
+    set ERROR=%ERRORLEVEL%
+    echo Installation of elytron ended with error code: "%ERROR%"
+    if %ERROR% neq 0 (
+        goto shutdown_jboss
+    )
+) else (
+    call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%CLI_PATH%\remove-elytron-subsystem.cli"
+    set ERROR=%ERRORLEVEL%
+    echo Removing elytron subsystem ended with error code: "%ERROR%"
+    if %ERROR% neq 0 (
+        goto shutdown_jboss
+    )
 )
 
 
+if "%SAML_SUPPORTED%" == "true" (
+    call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-install-saml.cli"
+    set ERROR=%ERRORLEVEL%
+    echo Installation of SAML adapter ended with error code: "%ERROR%"
+    if %ERROR% neq 0 (
+        goto shutdown_jboss
+    )
+
+    if "%ELYTRON_SUPPORTED%" == "true" (
+        call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-elytron-install-saml.cli"
+        set ERROR=%ERRORLEVEL%
+        echo Installation of saml elytron ended with error code: "%ERROR%"
+        if %ERROR% neq 0 (
+            goto shutdown_jboss
+        )
+    )
+)
+
 :shutdown_jboss
+echo Shutting down with error code: "%ERROR%"
 call %JBOSS_HOME%\bin\jboss-cli.bat -c --command=":shutdown"
 exit /b %ERROR%

testsuite/integration-arquillian/servers/app-server/jboss/pom.xml

@@ -36,6 +36,7 @@
         <security.xslt>security.xsl</security.xslt>
         <oidc-adapter.version>${project.version}</oidc-adapter.version>
         <saml-adapter.version>${project.version}</saml-adapter.version>
+        <app.server.elytron.adapter.supported>false</app.server.elytron.adapter.supported>
     </properties>
 
     <profiles>

testsuite/integration-arquillian/tests/base/pom.xml

@@ -253,13 +253,12 @@
             <!--see KEYCLOAK-4793-->
             <id>kie.maven.settings</id>
             <activation>
-                <property>
+                <activeByDefault>true</activeByDefault>
-                    <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>
+                <repo.url/>
                 <kie.maven.settings>
                     -Dkie.maven.settings.custom=${settings.path}
                     -Dkie.maven.repo.local=${maven.repo.local}

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/RulesPolicyManagementTest.java

@@ -97,7 +97,7 @@ public class RulesPolicyManagementTest extends AbstractPolicyManagementTest {
         representation.setLogic(Logic.NEGATIVE);
         representation.setArtifactGroupId("org.keycloak");
         representation.setArtifactId("photoz-authz-policy");
-        representation.setArtifactVersion(Version.VERSION);
+        representation.setArtifactVersion(System.getProperty("project.version"));
         representation.setModuleName("PhotozAuthzOwnerPolicy");
         representation.setSessionName("MainOwnerSession");
         representation.setScannerPeriod("1");