KEYCLOAK-8837 Adapt TS to be able to test migration from 7.2.5.GA (instead from 7.2.0.GA)

Fix KEYCLOAK-8832 (#5735 )
Avoid NullPointerException when browser sends "Origin" header and allowedOrigin is null. This happens on chrome with admin console
2018-11-19 18:06:33 +01:00 · 2018-11-19 17:53:05 +01:00 · 2018-11-19 17:32:21 +01:00 · 2018-11-19 16:04:43 +01:00 · 2018-11-19 14:38:41 +01:00 · 2018-11-19 14:33:20 +01:00
528 changed files with 6050 additions and 1907 deletions
@@ -60,3 +60,7 @@ target
 # KEYCLOAK-5391: We will re-exclude node_modules when node_modules handling is worked out.
 # For now, we keep our js libraries checked into GitHub, so we don't ignore.
 #node_modules
 # testsuite #
 #############
 *offline-token.txt
@@ -0,0 +1,54 @@
 ADOPTERS
 ========
 PUBLIC REFERENCES
 -----------------
 List of organization names below is based on information collected using Keycloak Community Survey. It contains company names from participants who agreed to serve as public reference. If organizations would like get added or removed please make a PR. 
 * Accenture
 * Actinver
 * Akvo Foundation
 * Appier
 * BISPRO
 * Bluestem Brands, Inc
 * Bundesversicherungsamt
 * Capgemini
 * Chassi
 * CloudNative Inc.
 * Copenhagen Optimization
 * Curecomp GmbH
 * Cybertech
 * Devsu
 * Devoxx / Voxxed
 * DUENE e.V - project 
 * DukeCon
 * European Synchrotron Radiation Facility
 * Fluance AG
 * Hewlett-Packard Enterprise
 * Hitachi
 * INEAT
 * Inventage
 * ISAAC
 * ITROI Solutions
 * Kindly Ops, LLC
 * msg systems ag
 * Netdava International
 * Ohio Supercomputer Center
 * Okta
 * PharmaPartners B.V.
 * Plivo
 * Price Insight
 * Prodesan
 * Quest Software
 * Research Industrial Software Engineering (RISE)
 * Sportsbet.com.au
 * Stack Labs
 * Storebrand
 * Synekus
 * Synetek Solutions
 * Taklane
 * TrackingSport
 * TRT9 - Brasil
 * UnitedHealthcare
 * ...More individuals
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-as7-integration-pom</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak AS7 / JBoss EAP 6 Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-fuse7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Jetty Integration</name>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.6.0.Final-SNAPSHOT</version>
+		<version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OIDC Client Adapter Modules</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>keycloak-parent</artifactId>
    <groupId>org.keycloak</groupId>
-    <version>4.6.0.Final-SNAPSHOT</version>
+    <version>4.7.0.Final-SNAPSHOT</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
      <artifactId>keycloak-parent</artifactId>
      <groupId>org.keycloak</groupId>
-      <version>4.6.0.Final-SNAPSHOT</version>
+      <version>4.7.0.Final-SNAPSHOT</version>
      <relativePath>../../../pom.xml</relativePath>
    </parent>
    <artifactId>spring-boot-container-bundle</artifactId>
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>keycloak-parent</artifactId>
    <groupId>org.keycloak</groupId>
-    <version>4.6.0.Final-SNAPSHOT</version>
+    <version>4.7.0.Final-SNAPSHOT</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>keycloak-parent</artifactId>
    <groupId>org.keycloak</groupId>
-    <version>4.6.0.Final-SNAPSHOT</version>
+    <version>4.7.0.Final-SNAPSHOT</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Tomcat Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-tomcat-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.6.0.Final-SNAPSHOT</version>
+		<version>4.7.0.Final-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.6.0.Final-SNAPSHOT</version>
+		<version>4.7.0.Final-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-tomcat-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak WildFly Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Keycloak Adapters</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-saml-eap-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML EAP Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-saml-eap-integration-pom</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
 		<relativePath>../../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Jetty Integration</name>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Client Adapter Modules</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Tomcat Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.6.0.Final-SNAPSHOT</version>
+		<version>4.7.0.Final-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
 		<artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.6.0.Final-SNAPSHOT</version>
+		<version>4.7.0.Final-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-saml-tomcat-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML Wildfly Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Client Adapter SPI Modules</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
@@ -25,7 +25,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-provider-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-provider-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
@@ -22,7 +22,7 @@
    <parent>
        <groupId>org.keycloak.bom</groupId>
        <artifactId>keycloak-bom-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
    </parent>
    <groupId>org.keycloak.bom</groupId>
@@ -37,107 +37,107 @@
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-core</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-adapter-core</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-adapter-spi</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-wildfly-adapter-dist</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-saml-adapter-core</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-saml-adapter-api-public</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-tomcat8-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-tomcat7-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-tomcat6-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-jetty81-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-jetty91-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-jetty92-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-jetty93-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-undertow-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-spring-boot-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-spring-boot-2-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>spring-boot-container-bundle</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-spring-security-adapter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-spring-boot-starter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-legacy-spring-boot-starter</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-authz-client</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
        </dependencies>
    </dependencyManagement>
@@ -26,7 +26,7 @@
    <groupId>org.keycloak.bom</groupId>
    <artifactId>keycloak-bom-parent</artifactId>
-    <version>4.6.0.Final-SNAPSHOT</version>
+    <version>4.7.0.Final-SNAPSHOT</version>
    <packaging>pom</packaging>
@@ -23,7 +23,7 @@
    <parent>
        <groupId>org.keycloak.bom</groupId>
        <artifactId>keycloak-bom-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
    </parent>
    <groupId>org.keycloak.bom</groupId>
@@ -38,12 +38,12 @@
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-core</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-server-spi</artifactId>
-                <version>4.6.0.Final-SNAPSHOT</version>
+                <version>4.7.0.Final-SNAPSHOT</version>
            </dependency>
        </dependencies>
    </dependencyManagement>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -47,10 +47,10 @@ public class Profile {
        ADMIN_FINE_GRAINED_AUTHZ(Type.PREVIEW),
        DOCKER(Type.DISABLED_BY_DEFAULT),
        IMPERSONATION(Type.DEFAULT),
-        OPENSHIFT_INTEGRATION(Type.DEFAULT),
+        OPENSHIFT_INTEGRATION(Type.PREVIEW),
        SCRIPTS(Type.PREVIEW),
        TOKEN_EXCHANGE(Type.PREVIEW),
-        AUTHZ_DROOLS_POLICY(Type.PREVIEW);;
+        AUTHZ_DROOLS_POLICY(Type.PREVIEW);
        private Type type;
@@ -106,7 +106,7 @@ public class Profile {
                    break;
                case PREVIEW:
                    previewFeatures.add(f);
-                    if (enabled == null || !enabled) {
+                    if ((enabled == null || !enabled) && !profile.equals(ProfileValue.PREVIEW)) {
                        disabledFeatures.add(f);
                    } else {
                        logger.info("Preview feature enabled: " + f.name().toLowerCase());
@@ -28,6 +28,7 @@ import java.util.Properties;
 public class Version {
    public static final String UNKNOWN = "UNKNOWN";
    public static String NAME;
    public static String NAME_FULL;
    public static String NAME_HTML;
    public static String VERSION;
    public static String RESOURCES_VERSION;
@@ -40,6 +41,7 @@ public class Version {
        try {
            props.load(is);
            Version.NAME = props.getProperty("name");
            Version.NAME_FULL = props.getProperty("name-full");
            Version.NAME_HTML = props.getProperty("name-html");
            Version.DEFAULT_PROFILE = props.getProperty("default-profile");
            Version.VERSION = props.getProperty("version");
@@ -16,6 +16,7 @@
 #
 name=${product.name}
 name-full=${product.name.full}
 name-html=${product.name-html}
 version=${product.version}
 build-time=${product.build-time}
@@ -22,8 +22,8 @@ public class ProfileTest {
    @Test
    public void checkDefaults() {
        Assert.assertEquals("community", Profile.getName());
-        assertEquals(Profile.getDisabledFeatures(), Profile.Feature.ACCOUNT2, Profile.Feature.ACCOUNT_API, Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.DOCKER, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.AUTHZ_DROOLS_POLICY);
+        assertEquals(Profile.getDisabledFeatures(), Profile.Feature.ACCOUNT2, Profile.Feature.ACCOUNT_API, Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.DOCKER, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.AUTHZ_DROOLS_POLICY, Profile.Feature.OPENSHIFT_INTEGRATION);
-        assertEquals(Profile.getPreviewFeatures(), Profile.Feature.ACCOUNT_API, Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.AUTHZ_DROOLS_POLICY);
+        assertEquals(Profile.getPreviewFeatures(), Profile.Feature.ACCOUNT_API, Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, Profile.Feature.SCRIPTS, Profile.Feature.TOKEN_EXCHANGE, Profile.Feature.AUTHZ_DROOLS_POLICY, Profile.Feature.OPENSHIFT_INTEGRATION);
        assertEquals(Profile.getExperimentalFeatures(), Profile.Feature.ACCOUNT2);
    }
@@ -31,6 +31,7 @@ public class ProfileTest {
    public void configWithSystemProperties() {
        Assert.assertEquals("community", Profile.getName());
        Assert.assertFalse(Profile.isFeatureEnabled(Profile.Feature.DOCKER));
        Assert.assertFalse(Profile.isFeatureEnabled(Profile.Feature.OPENSHIFT_INTEGRATION));
        Assert.assertTrue(Profile.isFeatureEnabled(Profile.Feature.IMPERSONATION));
        System.setProperty("keycloak.profile", "preview");
@@ -41,6 +42,7 @@ public class ProfileTest {
        Assert.assertEquals("preview", Profile.getName());
        Assert.assertTrue(Profile.isFeatureEnabled(Profile.Feature.DOCKER));
        Assert.assertTrue(Profile.isFeatureEnabled(Profile.Feature.OPENSHIFT_INTEGRATION));
        Assert.assertFalse(Profile.isFeatureEnabled(Profile.Feature.IMPERSONATION));
        System.getProperties().remove("keycloak.profile");
@@ -73,6 +75,7 @@ public class ProfileTest {
        Assert.assertEquals("preview", Profile.getName());
        Assert.assertTrue(Profile.isFeatureEnabled(Profile.Feature.DOCKER));
        Assert.assertTrue(Profile.isFeatureEnabled(Profile.Feature.OPENSHIFT_INTEGRATION));
        Assert.assertFalse(Profile.isFeatureEnabled(Profile.Feature.IMPERSONATION));
        System.getProperties().remove("jboss.server.config.dir");
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 */
 public class ECPublicJWK extends JWK {
    public static final String EC = "EC";
    public static final String CRV = "crv";
    public static final String X = "x";
    public static final String Y = "y";
@@ -128,7 +128,7 @@ public class JWKParser {
    }
    public boolean isKeyTypeSupported(String keyType) {
-        return RSAPublicJWK.RSA.equals(keyType);
+        return (RSAPublicJWK.RSA.equals(keyType) || ECPublicJWK.EC.equals(keyType));
    }
 }
@@ -44,6 +44,8 @@ public class RealmRepresentation {
    protected Integer accessTokenLifespanForImplicitFlow;
    protected Integer ssoSessionIdleTimeout;
    protected Integer ssoSessionMaxLifespan;
    protected Integer ssoSessionIdleTimeoutRememberMe;
    protected Integer ssoSessionMaxLifespanRememberMe;
    protected Integer offlineSessionIdleTimeout;
    // KEYCLOAK-7688 Offline Session Max for Offline Token
    protected Boolean offlineSessionMaxLifespanEnabled;
@@ -300,6 +302,22 @@ public class RealmRepresentation {
        this.ssoSessionMaxLifespan = ssoSessionMaxLifespan;
    }
    public Integer getSsoSessionMaxLifespanRememberMe() {
        return ssoSessionMaxLifespanRememberMe;
    }
    public void setSsoSessionMaxLifespanRememberMe(Integer ssoSessionMaxLifespanRememberMe) {
        this.ssoSessionMaxLifespanRememberMe = ssoSessionMaxLifespanRememberMe;
    }
    public Integer getSsoSessionIdleTimeoutRememberMe() {
        return ssoSessionIdleTimeoutRememberMe;
    }
    public void setSsoSessionIdleTimeoutRememberMe(Integer ssoSessionIdleTimeoutRememberMe) {
        this.ssoSessionIdleTimeoutRememberMe = ssoSessionIdleTimeoutRememberMe;
    }
    public Integer getOfflineSessionIdleTimeout() {
        return offlineSessionIdleTimeout;
    }
@@ -17,6 +17,8 @@
 package org.keycloak.util;
 import org.keycloak.crypto.KeyUse;
 import org.keycloak.crypto.KeyWrapper;
 import org.keycloak.jose.jwk.JSONWebKeySet;
 import org.keycloak.jose.jwk.JWK;
 import org.keycloak.jose.jwk.JWKParser;
@@ -43,6 +45,34 @@ public class JWKSUtils {
        return result;
    }
    public static Map<String, KeyWrapper> getKeyWrappersForUse(JSONWebKeySet keySet, JWK.Use requestedUse) {
        Map<String, KeyWrapper> result = new HashMap<>();
        for (JWK jwk : keySet.getKeys()) {
            JWKParser parser = JWKParser.create(jwk);
            if (jwk.getPublicKeyUse().equals(requestedUse.asString()) && parser.isKeyTypeSupported(jwk.getKeyType())) {
                KeyWrapper keyWrapper = new KeyWrapper();
                keyWrapper.setKid(jwk.getKeyId());
                keyWrapper.setAlgorithm(jwk.getAlgorithm());
                keyWrapper.setType(jwk.getKeyType());
                keyWrapper.setUse(getKeyUse(jwk.getPublicKeyUse()));
                keyWrapper.setVerifyKey(parser.toPublicKey());
                result.put(keyWrapper.getKid(), keyWrapper);
            }
        }
        return result;
    }
    private static KeyUse getKeyUse(String keyUse) {
        switch (keyUse) {
            case "sig" : 
                return KeyUse.SIG;
            case "enc" : 
                return KeyUse.ENC;
            default :
                return null;
        }
    }
    public static JWK getKeyForUse(JSONWebKeySet keySet, JWK.Use requestedUse) {
        for (JWK jwk : keySet.getKeys()) {
            JWKParser parser = JWKParser.create(jwk);
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.6.0.Final-SNAPSHOT</version>
+		<version>4.7.0.Final-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>4.6.0.Final-SNAPSHOT</version>
+		<version>4.7.0.Final-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
@@ -25,7 +25,7 @@
    <parent>
        <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>4.6.0.Final-SNAPSHOT</version>
+        <version>4.7.0.Final-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
Author	SHA1	Message	Date
vramik	55f90ff09f	KEYCLOAK-8837 Adapt TS to be able to test migration from 7.2.5.GA (instead from 7.2.0.GA)	2018-11-19 18:06:33 +01:00
Cédric Couralet	dc06a8cee3	Fix KEYCLOAK-8832 (#5735 ) Avoid NullPointerException when browser sends "Origin" header and allowedOrigin is null. This happens on chrome with admin console	2018-11-19 17:53:05 +01:00
Stian Thorgersen	f3bf1456ab	KEYCLOAK-8781 Mark OpenShift integration as preview. Fix issue in Profile where preview features was not enabled in preview mode. (#5738 )	2018-11-19 17:32:21 +01:00
Hynek Mlnarik	548950ed8e	KEYCLOAK-8756 Consider also required actions of AuthenticationSession	2018-11-19 16:04:43 +01:00
Marek Posolda	f67d6f9660	KEYCLOAK-8482 Access token should never contain azp as an audience (#5719 )	2018-11-19 14:38:41 +01:00
Stian Thorgersen	a1d86fbce8	Prepare for RH-SSO 7.2.0.ER1 (#5729 ) * Prepare for RH-SSO 7.2.0.ER1 * Update pom.xml	2018-11-19 14:33:20 +01:00
Stian Thorgersen	3756cf629b	KEYCLOAK-7081 Fixes for manual/qr mode switches on login config otp page (#5717 )	2018-11-19 14:32:28 +01:00
Takashi Norimatsu	0793234c19	KEYCLOAK-8460 Request Object Signature Verification Other Than RS256 (#5603 ) * KEYCLOAK-8460 Request Object Signature Verification Other Than RS256 also support client signed signature verification by refactored token verification mechanism * KEYCLOAK-8460 Request Object Signature Verification Other Than RS256 incorporate feedbacks and refactor client public key loading mechanism * KEYCLOAK-8460 Request Object Signature Verification Other Than RS256 unsigned request object not allowed * KEYCLOAK-8460 Request Object Signature Verification Other Than RS256 revert to re-support "none"	2018-11-19 14:28:32 +01:00
Hynek Mlnarik	461dae20de	KEYCLOAK-8731 Ensure password history is kept in line with password policy	2018-11-19 12:48:51 +01:00
Stefan Guilhen	a3d4612edd	KEYCLOAK-8854 Updated UserSessionPredicate.ExternalizerImpl to include the remember-me properties	2018-11-19 12:17:03 +01:00
mposolda	0533782d90	KEYCLOAK-7275 KEYCLOAK-5479 Faster offline sessions preloading at startup. Track lastSessionRefresh timestamps more properly by support bulk update to DB	2018-11-16 14:23:28 +01:00
Michael Gottlieb	3bdbbf41af	KEYCLOAK-8702:Fix Offline Sessions requires column Prevent RemoveDuplicateOfflineSessions from running when migration to 3.2.0 has been run. This prevents running when the database has already dropped CLIENT_SESSION_ID from OFFLINE_CLIENT_SESSION table. This change unblocks migrating from 3.2.0 to 4.4.0 and later.	2018-11-16 12:03:57 +01:00
Stan Silvert	0b36020bf5	KEYCLOAK-8759: Wrong RH-SSO name on Welcome Page	2018-11-15 13:00:55 -05:00
Leon Graser	85f11873c3	KEYCLOAK-8613 Group Membership Pagination	2018-11-15 17:54:07 +01:00
Gideon Caranzo	39bf08e1b9	KEYCLOAK-8783 also checked admin roles when realm admin client is specified	2018-11-15 14:23:18 +01:00
Gideon Caranzo	9f88abb022	KEYCLOAK-8783 only checked master and realm admin roles when roles are specified in imported realm	2018-11-15 14:23:18 +01:00
Boleslaw Dawidowicz	78b2067f73	List of adopters and contributors (#5709 ) * List of adopters * Update ADOPTERS.md	2018-11-15 08:14:38 +01:00
Thomas Darimont	cf57a1bc4b	KEYCLOAK-1267 Add dedicated SSO timeouts for Remember-Me Previously remember-me sessions where tied to the SSO max session timeout which could lead to unexpected early session timeouts. We now allow SSO timeouts to be configured separately for sessions with enabled remember-me. This enables users to opt-in for longer session timeouts. SSO session timeouts for remember-me can now be configured in the tokens tab in the realm admin console. This new configuration is optional and will tipically host values larger than the regular max SSO timeouts. If no value is specified for remember-me timeouts then the regular max SSO timeouts will be used. Work based on PR https://github.com/keycloak/keycloak/pull/3161 by Thomas Darimont <thomas.darimont@gmail.com>	2018-11-15 06:11:22 +01:00
vmuzikar	8c650f9f6a	KEYCLOAK-8793 Fix backward compatibility testing for adapters	2018-11-14 22:35:47 +01:00
vramik	22d8fb17f5	KEYCLOAK-8771 add jboss-jsp-api_2.3_spec dependency to app-server-undertow	2018-11-14 22:34:14 +01:00
vmuzikar	6cee8b126b	KEYCLOAK-8792 Stabilize and fix Admin Console UI tests for RH-SSO	2018-11-14 22:32:11 +01:00
Pedro Igor	f5ae76d8e3	[KEYCLOAK-8768] - Policy evaluation tool failing when client is used and identity.getId is called	2018-11-14 19:16:41 -02:00
stianst	e391328b5d	Don't fail on JavaDoc errors	2018-11-14 20:51:54 +01:00
stianst	ecd476fb10	Prepare for 4.7.0.Final	2018-11-14 20:10:59 +01:00
Hynek Mlnarik	c3778e66db	KEYCLOAK-8260 Improve SAML conditions handling	2018-11-14 20:09:22 +01:00
Martin Kanis	6a23eb19f5	KEYCLOAK-8166	2018-11-14 20:09:22 +01:00
Martin Kanis	72b23c1357	KEYCLOAK-8160	2018-11-14 20:09:22 +01:00
Martin Kanis	0cb6053699	KEYCLOAK-8125	2018-11-14 20:09:22 +01:00
vramik	6564cebc0f	KEYCLOAK-7707	2018-11-14 20:09:22 +01:00
Bruno Oliveira da Silva	a957e118e6	Redirect URLs are not normalized	2018-11-14 20:09:22 +01:00
mposolda	0897d969b1	KEYCLOAK-7340	2018-11-14 20:09:22 +01:00
mposolda	1b5a83c4f1	KEYCLOAK-6980 Check if client_assertion was already used during signed JWT client authentication	2018-11-14 20:09:22 +01:00
Martin Bartos RH	f090b39e85	[KEYCLOAK-8411] Migrate ModelClass: ClientModelTest	2018-11-14 19:15:45 +01:00
vmuzikar	5b72bd8da6	KEYCLOAK-8791 Fix AggregatePolicyManagementTest Admin Console UI test	2018-11-14 09:00:36 +01:00
mhajas	602a6e201d	KEYCLOAK-8660 Workaround photoz tests on EAP6	2018-11-13 15:57:46 +01:00
Stan Silvert	086dbae5ca	KEYCLOAK-8604: Figure out how forms will be handled	2018-11-13 07:45:50 -05:00