Set version to 2.2.0.Final

[KEYCLOAK-3534] - Fixing the logic to display the authz tab.
Set version to 2.2.0.Final-SNAPSHOT
2016-09-15 07:02:09 +00:00 · 2016-09-15 08:58:29 +02:00 · 2016-09-09 17:18:38 +00:00 · 2016-09-09 15:11:52 +00:00 · 2016-09-09 17:08:38 +02:00 · 2016-09-09 15:11:35 +02:00
806 changed files with 34782 additions and 6127 deletions
@@ -65,6 +65,7 @@ Contributing
    * [Testsuite](misc/Testsuite.md) - Details about testsuite, but also how to quickly run Keycloak during development and a few test tools (OTP generation, LDAP server, Mail server)
    * [Database Testing](misc/DatabaseTesting.md) - How to do testing of Keycloak on different databases
    * [Updating Database](misc/UpdatingDatabaseSchema.md) - How to change the Keycloak database
+    * [Changing the Default keycloak-subsystem Configuration](misc/UpdatingServerConfig.md) - How to update the default keycloak-subsystem config
 * [Developer Mailing List](https://lists.jboss.org/mailman/listinfo/keycloak-dev) - Mailing list to discuss development of Keycloak


@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -32,6 +32,7 @@ import org.keycloak.representations.adapters.config.PolicyEnforcerConfig.PathCon
 import org.keycloak.representations.idm.authorization.Permission;

 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -55,7 +56,7 @@ public abstract class AbstractPolicyEnforcer {
        this.enforcerConfig = policyEnforcer.getEnforcerConfig();
        this.authzClient = policyEnforcer.getClient();
        this.pathMatcher = new PathMatcher();
-        this.paths = policyEnforcer.getPaths();
+        this.paths = new ArrayList<>(policyEnforcer.getPaths());
    }

    public AuthorizationContext authorize(OIDCHttpFacade httpFacade) {
@@ -33,8 +33,12 @@ import org.keycloak.representations.adapters.config.PolicyEnforcerConfig.PathCon
 import org.keycloak.representations.idm.authorization.Permission;

 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;

 /**
@@ -95,8 +99,8 @@ public class PolicyEnforcer {
        return authzClient;
    }

-    List<PathConfig> getPaths() {
-        return paths;
+    public List<PathConfig> getPaths() {
+        return Collections.unmodifiableList(paths);
    }

    KeycloakDeployment getDeployment() {
@@ -154,13 +158,27 @@ public class PolicyEnforcer {

                    pathConfig.setId(registrationResponse.getId());
                } else {
-                    throw new RuntimeException("Could not find matching resource on server with uri [" + path + "] or name [" + resourceName + ". Make sure you have created a resource on the server that matches with the path configuration.");
+                    throw new RuntimeException("Could not find matching resource on server with uri [" + path + "] or name [" + resourceName + "]. Make sure you have created a resource on the server that matches with the path configuration.");
                }
            } else {
                pathConfig.setId(search.iterator().next());
            }

-            paths.add(pathConfig);
+            PathConfig existingPath = null;
+
+            for (PathConfig current : paths) {
+                if (current.getId().equals(pathConfig.getId()) && current.getPath().equals(pathConfig.getPath())) {
+                    existingPath = current;
+                    break;
+                }
+            }
+
+            if (existingPath == null) {
+                paths.add(pathConfig);
+            } else {
+                existingPath.getMethods().addAll(pathConfig.getMethods());
+                existingPath.getScopes().addAll(pathConfig.getScopes());
+            }
        }

        return paths;
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak AS7 / JBoss EAP 6 Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -154,21 +154,31 @@
                    return;
                } else if (initOptions) {
                    if (initOptions.token || initOptions.refreshToken) {
-                        setToken(initOptions.token, initOptions.refreshToken, initOptions.idToken, false);
+                        setToken(initOptions.token, initOptions.refreshToken, initOptions.idToken);
                        kc.timeSkew = initOptions.timeSkew || 0;

                        if (loginIframe.enable) {
                            setupCheckLoginIframe().success(function() {
                                checkLoginIframe().success(function () {
+                                    kc.onAuthSuccess && kc.onAuthSuccess();
                                    initPromise.setSuccess();
                                }).error(function () {
+                                    kc.onAuthError && kc.onAuthError();
                                    if (initOptions.onLoad) {
                                        onLoad();
                                    }
                                });
                            });
                        } else {
-                            initPromise.setSuccess();
+                            kc.updateToken(-1).success(function() {
+                                kc.onAuthSuccess && kc.onAuthSuccess();
+                                initPromise.setSuccess();
+                            }).error(function() {
+                                kc.onAuthError && kc.onAuthError();
+                                if (initOptions.onLoad) {
+                                    onLoad();
+                                }
+                            });
                        }
                    } else if (initOptions.onLoad) {
                        onLoad();
@@ -368,7 +378,7 @@
            minValidity = minValidity || 5;

            var exec = function() {
-                if (!kc.isTokenExpired(minValidity)) {
+                if (minValidity >= 0 && !kc.isTokenExpired(minValidity)) {
                    promise.setSuccess(false);
                } else {
                    var params = 'grant_type=refresh_token&' + 'refresh_token=' + kc.refreshToken;
@@ -380,6 +390,7 @@
                        var req = new XMLHttpRequest();
                        req.open('POST', url, true);
                        req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+                        req.withCredentials = true;

                        if (kc.clientId && kc.clientSecret) {
                            req.setRequestHeader('Authorization', 'Basic ' + btoa(kc.clientId + ':' + kc.clientSecret));
@@ -395,10 +406,10 @@
                                    timeLocal = (timeLocal + new Date().getTime()) / 2;

                                    var tokenResponse = JSON.parse(req.responseText);
-                                    setToken(tokenResponse['access_token'], tokenResponse['refresh_token'], tokenResponse['id_token'], true);
-
                                    kc.timeSkew = Math.floor(timeLocal / 1000) - kc.tokenParsed.iat;

+                                    setToken(tokenResponse['access_token'], tokenResponse['refresh_token'], tokenResponse['id_token']);
+
                                    kc.onAuthRefreshSuccess && kc.onAuthRefreshSuccess();
                                    for (var p = refreshQueue.pop(); p != null; p = refreshQueue.pop()) {
                                        p.setSuccess(true);
@@ -433,7 +444,7 @@

        kc.clearToken = function() {
            if (kc.token) {
-                setToken(null, null, null, true);
+                setToken(null, null, null);
                kc.onAuthLogout && kc.onAuthLogout();
                if (kc.loginRequired) {
                    kc.login();
@@ -514,7 +525,7 @@
            function authSuccess(accessToken, refreshToken, idToken, fulfillPromise) {
                timeLocal = (timeLocal + new Date().getTime()) / 2;

-                setToken(accessToken, refreshToken, idToken, true);
+                setToken(accessToken, refreshToken, idToken);

                if ((kc.tokenParsed && kc.tokenParsed.nonce != oauth.storedNonce) ||
                    (kc.refreshTokenParsed && kc.refreshTokenParsed.nonce != oauth.storedNonce) ||
@@ -598,7 +609,7 @@
            return promise.promise;
        }

-        function setToken(token, refreshToken, idToken, useTokenTime) {
+        function setToken(token, refreshToken, idToken) {
            if (kc.tokenTimeoutHandle) {
                clearTimeout(kc.tokenTimeoutHandle);
                kc.tokenTimeoutHandle = null;
@@ -618,9 +629,12 @@
                kc.resourceAccess = kc.tokenParsed.resource_access;

                if (kc.onTokenExpired) {
-                    var start = useTokenTime ? kc.tokenParsed.iat : (new Date().getTime() / 1000);
-                    var expiresIn = kc.tokenParsed.exp - start;
-                    kc.tokenTimeoutHandle = setTimeout(kc.onTokenExpired, expiresIn * 1000);
+                    var expiresIn = (kc.tokenParsed['exp'] - (new Date().getTime() / 1000) + kc.timeSkew) * 1000;
+                    if (expiresIn <= 0) {
+                        kc.onTokenExpired();
+                    } else {
+                        kc.tokenTimeoutHandle = setTimeout(kc.onTokenExpired, expiresIn);
+                    }
                }

            } else {
@@ -1055,7 +1069,7 @@
            if (!(this instanceof CookieStorage)) {
                return new CookieStorage();
            }
-            
+
            var cs = this;

            cs.get = function(state) {
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+    <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -69,6 +69,5 @@ public class HttpSessionManager implements HttpSessionListener, UserSessionManag
                session.invalidate();
            }
        }
-        sessions.clear();
    }
 }
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Keycloak Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-saml-eap-integration-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -25,7 +25,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-provider-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -37,12 +37,10 @@ public class TimePolicyAdminResource implements PolicyProviderAdminService {
        String nbf = policy.getConfig().get("nbf");
        String noa = policy.getConfig().get("noa");

-        if (nbf == null && noa == null) {
-            throw new RuntimeException("You must provide NotBefore, NotOnOrAfter or both.");
+        if (nbf != null && noa != null) {
+            validateFormat(nbf);
+            validateFormat(noa);
        }
-
-        validateFormat(nbf);
-        validateFormat(noa);
    }

    @Override
@@ -22,8 +22,11 @@ import org.keycloak.authorization.policy.evaluation.Evaluation;
 import org.keycloak.authorization.policy.provider.PolicyProvider;

 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;

+import static com.sun.corba.se.spi.activation.IIOP_CLEAR_TEXT.value;
+
 /**
 * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
 */
@@ -45,9 +48,7 @@ public class TimePolicyProvider implements PolicyProvider {
    public void evaluate(Evaluation evaluation) {
        try {
            String notBefore = this.policy.getConfig().get("nbf");
-
            if (notBefore != null) {
-
                if (this.currentDate.before(this.dateFormat.parse(format(notBefore)))) {
                    evaluation.deny();
                    return;
@@ -55,7 +56,6 @@ public class TimePolicyProvider implements PolicyProvider {
            }

            String notOnOrAfter = this.policy.getConfig().get("noa");
-
            if (notOnOrAfter != null) {
                if (this.currentDate.after(this.dateFormat.parse(format(notOnOrAfter)))) {
                    evaluation.deny();
@@ -63,12 +63,48 @@ public class TimePolicyProvider implements PolicyProvider {
                }
            }

+            if (isInvalid(Calendar.DAY_OF_MONTH, "dayMonth")
+                    || isInvalid(Calendar.MONTH, "month")
+                    || isInvalid(Calendar.YEAR, "year")
+                    || isInvalid(Calendar.HOUR_OF_DAY, "hour")
+                    || isInvalid(Calendar.MINUTE, "minute")) {
+                evaluation.deny();
+                return;
+            }
+
            evaluation.grant();
        } catch (Exception e) {
            throw new RuntimeException("Could not evaluate time-based policy [" + this.policy.getName() + "].", e);
        }
    }

+    private boolean isInvalid(int timeConstant, String configName) {
+        Calendar calendar = Calendar.getInstance();
+
+        calendar.setTime(this.currentDate);
+
+        int dateField = calendar.get(timeConstant);
+
+        if (Calendar.MONTH == timeConstant) {
+            dateField++;
+        }
+
+        String start = this.policy.getConfig().get(configName);
+        if (start != null) {
+            String end = this.policy.getConfig().get(configName + "End");
+            if (end != null) {
+                if (dateField < Integer.parseInt(start)  || dateField > Integer.parseInt(end)) {
+                    return true;
+                }
+            } else {
+                if (dateField != Integer.parseInt(start)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
    static String format(String notBefore) {
        String trimmed = notBefore.trim();

@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-provider-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-authz-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>keycloak-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2016 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.keycloak.common.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+@SuppressWarnings("serial")
+public class ConcurrentMultivaluedHashMap<K, V> extends ConcurrentHashMap<K, List<V>>
+{
+   public void putSingle(K key, V value)
+   {
+      List<V> list = new CopyOnWriteArrayList<>();
+      list.add(value);
+      put(key, list);
+   }
+
+   public void addAll(K key, V... newValues)
+   {
+      for (V value : newValues)
+      {
+         add(key, value);
+      }
+   }
+
+   public void addAll(K key, List<V> valueList)
+   {
+      for (V value : valueList)
+      {
+         add(key, value);
+      }
+   }
+
+   public void addFirst(K key, V value)
+   {
+      List<V> list = get(key);
+      if (list == null)
+      {
+         add(key, value);
+      }
+      else
+      {
+         list.add(0, value);
+      }
+   }
+   public final void add(K key, V value)
+   {
+      getList(key).add(value);
+   }
+
+
+   public final void addMultiple(K key, Collection<V> values)
+   {
+      getList(key).addAll(values);
+   }
+
+   public V getFirst(K key)
+   {
+      List<V> list = get(key);
+      return list == null ? null : list.get(0);
+   }
+
+   public final List<V> getList(K key)
+   {
+      List<V> list = get(key);
+      if (list == null)
+         put(key, list = new CopyOnWriteArrayList<V>());
+      return list;
+   }
+
+   public void addAll(ConcurrentMultivaluedHashMap<K, V> other)
+   {
+      for (Entry<K, List<V>> entry : other.entrySet())
+      {
+         getList(entry.getKey()).addAll(entry.getValue());
+      }
+   }
+
+}
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -16,12 +16,31 @@
 */
 package org.keycloak.representations;

+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.keycloak.json.StringOrArrayDeserializer;
+import org.keycloak.json.StringOrArraySerializer;

 /**
 * @author pedroigor
 */
 public class UserInfo {
+
+    // Should be in signed UserInfo response
+    @JsonProperty("iss")
+    protected String issuer;
+    @JsonProperty("aud")
+    @JsonSerialize(using = StringOrArraySerializer.class)
+    @JsonDeserialize(using = StringOrArrayDeserializer.class)
+    protected String[] audience;
+
    @JsonProperty("sub")
    protected String sub;

@@ -85,6 +104,34 @@ public class UserInfo {
    @JsonProperty("claims_locales")
    protected String claimsLocales;

+    protected Map<String, Object> otherClaims = new HashMap<>();
+
+    public String getIssuer() {
+        return issuer;
+    }
+
+    public void setIssuer(String issuer) {
+        this.issuer = issuer;
+    }
+
+    @JsonIgnore
+    public String[] getAudience() {
+        return audience;
+    }
+
+    public boolean hasAudience(String audience) {
+        for (String a : this.audience) {
+            if (a.equals(audience)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void setAudience(String... audience) {
+        this.audience = audience;
+    }
+
    public String getSubject() {
        return this.sub;
    }
@@ -260,4 +307,19 @@ public class UserInfo {
    public void setClaimsLocales(String claimsLocales) {
        this.claimsLocales = claimsLocales;
    }
+
+    /**
+     * This is a map of any other claims and data that might be in the UserInfo.  Could be custom claims set up by the auth server
+     *
+     * @return
+     */
+    @JsonAnyGetter
+    public Map<String, Object> getOtherClaims() {
+        return otherClaims;
+    }
+
+    @JsonAnySetter
+    public void setOtherClaims(String name, Object value) {
+        otherClaims.put(name, value);
+    }
 }
@@ -123,10 +123,15 @@ public class IdentityProviderRepresentation {
        this.updateProfileFirstLoginMode = updateProfileFirstLoginMode;
    }

+    /**
+     * @deprecated Replaced by configuration option in identity provider authenticator
+     */
+    @Deprecated
    public boolean isAuthenticateByDefault() {
        return authenticateByDefault;
    }

+    @Deprecated
    public void setAuthenticateByDefault(boolean authenticateByDefault) {
        this.authenticateByDefault = authenticateByDefault;
    }
@@ -123,6 +123,8 @@ public class RealmRepresentation {
    protected String resetCredentialsFlow;
    protected String clientAuthenticationFlow;

+    protected Map<String, String> attributes;
+
    protected String keycloakVersion;

    @Deprecated
@@ -864,4 +866,12 @@ public class RealmRepresentation {
        return identityProviders != null && !identityProviders.isEmpty();
    }

+    public void setAttributes(Map<String, String> attributes) {
+        this.attributes = attributes;
+    }
+
+    public Map<String, String> getAttributes() {
+        return attributes;
+    }
+
 }
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -83,7 +83,6 @@
            <groupId>org.keycloak</groupId>
            <artifactId>keycloak-kerberos-federation</artifactId>
        </dependency>
-
        <!-- saml -->
        <dependency>
            <groupId>org.keycloak</groupId>
@@ -110,6 +109,12 @@
            </exclusions>
        </dependency>

+        <!-- Dependencies for RHEL IdM -->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-sssd-federation</artifactId>
+        </dependency>
+
        <!-- Built-in Authorization Policy Providers  -->
        <dependency>
            <groupId>org.keycloak</groupId>
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.2.0.Final</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>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -25,7 +25,7 @@
    <parent>
        <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -16,31 +16,21 @@
  -->

 <assembly>
-    
-    <id>auth-server-jboss-kc15</id>
+    <id>fuse-adapter-dist</id>

    <formats>
        <format>zip</format>
+        <format>tar.gz</format>
    </formats>
-
    <includeBaseDirectory>false</includeBaseDirectory>

    <fileSets>
        <fileSet>
-            <directory>${keycloak.server.home}</directory>
-            <outputDirectory>keycloak-1.5.1.Final</outputDirectory>
-            <excludes>
-                <exclude>**/*.sh</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${keycloak.server.home}</directory>
-            <outputDirectory>keycloak-1.5.1.Final</outputDirectory>
+            <directory>${project.build.directory}/system</directory>
            <includes>
-                <include>**/*.sh</include>
+                <include>*/**</include>
            </includes>
-            <fileMode>0755</fileMode>
+            <outputDirectory>system</outputDirectory>
        </fileSet>
    </fileSets>
-
-</assembly>
+</assembly>
@@ -0,0 +1,173 @@
+<!--
+  ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+  ~ and other contributors as indicated by the @author tags.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>2.2.0.Final</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>keycloak-fuse-adapter-dist</artifactId>
+    <packaging>pom</packaging>
+    <name>Keycloak Fuse Adapter Distro</name>
+    <description/>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-osgi-features</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-osgi-thirdparty</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-authz-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-osgi-adapter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jetty-adapter-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jetty-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jetty81-adapter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-osgi-jaas</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jetty92-adapter</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/system</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>assemble</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly.xml</descriptor>
+                            </descriptors>
+                            <outputDirectory>target</outputDirectory>
+                            <workDirectory>target/assembly/work</workDirectory>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI Features</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI JAAS Realm Configuration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI Integration</name>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>keycloak-distribution-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
    </parent>

    <name>Adapters Distribution Parent</name>
@@ -32,6 +32,7 @@

    <modules>
        <module>as7-eap6-adapter</module>
+        <module>fuse-adapter-zip</module>
        <module>jetty81-adapter-zip</module>
        <module>jetty91-adapter-zip</module>
        <module>jetty92-adapter-zip</module>
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -21,7 +21,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.2.0.Final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
Author	SHA1	Message	Date
keycloak-bot	dd48b01d83	Set version to 2.2.0.Final	2016-09-15 07:02:09 +00:00
Pedro Igor	f548c210e3	[KEYCLOAK-3534] - Fixing the logic to display the authz tab.	2016-09-15 08:58:29 +02:00
keycloak-bot	4569fb761d	Set version to 2.2.0.Final-SNAPSHOT	2016-09-09 17:18:38 +00:00
keycloak-bot	930da93182	Set version to 2.2.0.CR1	2016-09-09 15:11:52 +00:00
Stian Thorgersen	05ae84d533	Added version for keycloak-fuse-adapter-dist	2016-09-09 17:08:38 +02:00
Stian Thorgersen	59674e44bf	Update HackingOnKeycloak.md	2016-09-09 15:11:35 +02:00
Marek Posolda	efaa88b4e3	Merge pull request #3222 from mposolda/master KEYCLOAK-3547 Incorrect jpa-changelog-2.2.0.xml	2016-09-09 13:20:04 +02:00
Marek Posolda	f55a526ebb	Merge pull request #3223 from stianst/master KEYCLOAK-3535 Tweak logging for SSSD	2016-09-09 13:19:51 +02:00
Stian Thorgersen	ccb9433e5c	KEYCLOAK-3535 Tweak logging for SSSD	2016-09-09 11:32:06 +02:00
mposolda	9d79a847c8	KEYCLOAK-3547 Incorrect jpa-changelog-2.2.0.xml	2016-09-09 09:47:32 +02:00
Stian Thorgersen	1630b9a20c	Merge pull request #3220 from abstractj/KEYCLOAK-3535 KEYCLOAK-3535 - Check if SSSD is available via DBUS	2016-09-09 08:15:11 +02:00
Stian Thorgersen	65befb16fd	Merge pull request #3219 from pedroigor/KEYCLOAK-3534 [KEYCLOAK-3534] - Authorization tab appears too soon in admin console	2016-09-09 08:14:03 +02:00
Stian Thorgersen	e8f99a2109	Merge pull request #3221 from patriot1burke/master KEYCLOAK-3423	2016-09-09 07:45:53 +02:00
Pedro Igor	7af16fc747	[KEYCLOAK-3534] - Authorization tab appears too soon in admin console	2016-09-09 01:03:09 -03:00
Bill Burke	84f5c0926b	KEYCLOAK-3423	2016-09-08 16:47:06 -04:00
Bruno Oliveira	11245701d2	Check if SSSD is available via DBUS	2016-09-08 16:01:45 -03:00
Bill Burke	5c45c5e6e4	Merge pull request #3218 from patriot1burke/master jta=false for demo-dist	2016-09-08 09:42:49 -04:00
Bill Burke	04ee5ca7c1	jta=false for demo-dist	2016-09-08 09:42:05 -04:00
Stian Thorgersen	df5d37a8d9	Merge pull request #3215 from stianst/KEYCLOAK-3538 KEYCLOAK-3538 Update examples to refer to standalone.xml for config	2016-09-08 15:27:57 +02:00
Stian Thorgersen	55a86dc0f4	Merge pull request #3217 from vramik/KEYCLOAK-3545 KEYCLOAK-3545 remove jta=false from default datasource definition	2016-09-08 15:26:49 +02:00
Vlasta Ramik	fa8f60a5f0	remove jta=false from default datasource definition	2016-09-08 15:25:17 +02:00
Bill Burke	2a5c778af5	Merge pull request #3209 from patriot1burke/master KEYCLOAK-3440	2016-09-08 09:10:54 -04:00
Stian Thorgersen	f24d73e8d6	KEYCLOAK-3538 Update examples to refer to standalone.xml for config	2016-09-08 14:04:12 +02:00
Stian Thorgersen	6d40e0dd07	Merge pull request #3212 from didiez/master KEYCLOAK-3513 Prevent clearing all registered sessions when invalidating some by sessionId	2016-09-08 13:50:14 +02:00
Marek Posolda	529ef3a425	Merge pull request #3213 from mposolda/master KEYCLOAK-3542 Not possible to enable bruteForceProtection for realm	2016-09-08 13:41:18 +02:00
Stian Thorgersen	36bb94afb8	Environment dependent provider	2016-09-08 07:40:19 -03:00
mposolda	4fd0238ca9	KEYCLOAK-3542 Not possible to enable bruteForceProtection for realm	2016-09-08 12:30:38 +02:00
Marek Posolda	76e1160b36	Merge pull request #3210 from mposolda/master KEYCLOAK-3537 Username not shown when validation error on Account pro…	2016-09-08 10:04:38 +02:00
didiez	df3079852e	Prevent clearing all registered sessions when invalidating some by sessionId	2016-09-08 09:19:30 +02:00
Stian Thorgersen	71b648a9b6	Merge pull request #3183 from mohitsuman/KEYCLOAK-3502 Keycloak 3502 - Implement "Empty State" for Identity Providers in Admin Console	2016-09-08 08:53:06 +02:00
Stian Thorgersen	ab7bb21991	Merge pull request #3160 from ramunask/feature-lithuanian-locale KEYCLOAK-3452 add Lithuanian localization	2016-09-08 08:44:45 +02:00
Stian Thorgersen	348e0b6226	Merge pull request #3200 from mbaluch/master RHSSO-423 - Added default value for 'log-dir'. Set to ${project.build…	2016-09-08 08:42:54 +02:00
Stian Thorgersen	44b7210af7	Merge pull request #3203 from mhajas/eap6fix KEYCLOAK-3533 Fix forbidden page on eap6	2016-09-08 08:41:52 +02:00
Stian Thorgersen	f726caea9b	Merge pull request #3205 from stianst/KEYCLOAK-3342 KEYCLOAK-3342 Add Identity Provider authenticator	2016-09-08 08:40:32 +02:00
mposolda	16282aeb7b	KEYCLOAK-3537 Username not shown when validation error on Account profile page	2016-09-08 08:36:39 +02:00
Stian Thorgersen	d2c546bdc2	Merge pull request #3201 from pedroigor/KEYCLOAK-3129 [KEYCLOAK-3129] - Add authorization services endpoints to PermissionsTest	2016-09-08 08:03:40 +02:00
Stian Thorgersen	1f27fc9e4b	Merge pull request #3153 from cargosoft/KEYCLOAK-3327 KEYCLOAK-3327 Make realm attributes accessible via the RealmModel	2016-09-08 08:00:14 +02:00
Stian Thorgersen	7c292b1213	KEYCLOAK-3342 Add Identity Provider authenticator	2016-09-08 07:20:35 +02:00
Bill Burke	3b9a6b32e1	Revert "Revert "KEYCLOAK-3440"" This reverts commit `01e48dc4b8`.	2016-09-07 23:41:32 -04:00
Bill Burke	b0bb0d36ab	Merge remote-tracking branch 'upstream/master'	2016-09-07 23:19:45 -04:00
Bill Burke	cdda19d1f8	pom.xml	2016-09-07 23:19:16 -04:00
Bill Burke	759747ab5c	Merge pull request #3208 from keycloak/revert-3207-master Revert "KEYCLOAK-3440"	2016-09-07 23:17:52 -04:00
Bill Burke	01e48dc4b8	Revert "KEYCLOAK-3440"	2016-09-07 23:17:35 -04:00
Bill Burke	61b93c318f	Merge pull request #3207 from patriot1burke/master KEYCLOAK-3440	2016-09-07 23:15:44 -04:00
Bill Burke	3f35234cf5	Merge remote-tracking branch 'upstream/master'	2016-09-07 23:11:38 -04:00
Bill Burke	da135389c7	KEYCLOAK-3440	2016-09-07 23:11:28 -04:00
Marek Posolda	b3d7d48ec8	Merge pull request #3206 from mposolda/master KEYCLOAK-3494 Input elements backed by user attributes fail to update…	2016-09-07 22:02:38 +02:00
mposolda	5a015a6518	KEYCLOAK-3494 Input elements backed by user attributes fail to update in themes	2016-09-07 20:08:09 +02:00
Stian Thorgersen	7912bd4dae	Merge pull request #3195 from abstractj/KEYCLOAK-3036 Initial FreeIPA Integration	2016-09-07 12:45:35 +02:00
mhajas	c860d03a60	Fix forbidden page on eap6	2016-09-07 09:02:46 +02:00
Bruno Oliveira	1b2a5eda32	Initial FreeIPA Integration - Provide username/password authentication with PAM - Obtain user data from SSSD - Feature packs for dbus-java, libpam4j and SSSD API - Provisioning script	2016-09-06 18:04:43 -03:00
Pedro Igor	517413d38e	[KEYCLOAK-3129] - Add authorization services endpoints to PermissionsTest	2016-09-06 17:32:37 -03:00
Marek Baluch	fd25dbcb5c	RHSSO-423 - Added default value for 'log-dir'. Set to ${project.build.dir}/surefire-reports	2016-09-06 18:16:15 +02:00
Mohit Suman	bdbc4e1f6d	add margin and update the description text	2016-09-06 19:34:07 +05:30
Stian Thorgersen	eebd496c2f	Merge pull request #3199 from stianst/KEYCLOAK-3475 KEYCLOAK-3475 Fixes for on token expired event	2016-09-06 15:36:46 +02:00
Bill Burke	15d31a202f	Merge remote-tracking branch 'upstream/master'	2016-09-06 08:56:17 -04:00
Bill Burke	6714c1a136	cred refactor	2016-09-06 08:55:47 -04:00
Ramūnas Kraujutis	ca6d1f3c48	LT locale improvements	2016-09-06 14:58:09 +03:00
Ramūnas Kraujutis	c5a149a892	Merge remote-tracking branch 'upstream/master' into feature-lithuanian-locale	2016-09-06 14:50:07 +03:00
Stian Thorgersen	b33648cc29	Merge pull request #3191 from greg0ire/patch-1 Remove duplicate untranslated word	2016-09-06 13:42:32 +02:00
Stian Thorgersen	4a583712b8	Merge pull request #3182 from mohitsuman/KEYCLOAK-2706 Fixed dropdown menu in navigation bar in small screens	2016-09-06 13:16:38 +02:00
Stian Thorgersen	5d20651c66	KEYCLOAK-3475 Fixes for on token expired event	2016-09-06 13:00:37 +02:00
Stian Thorgersen	a49a288bbe	Merge pull request #3197 from stianst/KEYCLOAK-3475 KEYCLOAK-3475 Call event handlers when initialized with tokens	2016-09-06 11:32:03 +02:00
Marek Posolda	fbace351b3	Merge pull request #3198 from mposolda/master Fuse adapter ZIP download	2016-09-06 10:47:48 +02:00
mposolda	fbb2dfcf59	Fuse adapter ZIP download	2016-09-06 10:46:36 +02:00
Ramūnas Kraujutis	05813832fc	add newly added translations to Lithuanian locale files	2016-09-06 10:53:23 +03:00
Ramūnas Kraujutis	e67f8c7a61	Merge branch 'master-upstream' into feature-lithuanian-locale # Conflicts: # themes/src/main/resources/theme/base/account/messages/messages_en.properties # themes/src/main/resources/theme/base/account/theme.properties # themes/src/main/resources/theme/base/admin/theme.properties # themes/src/main/resources/theme/base/email/theme.properties # themes/src/main/resources/theme/base/login/theme.properties	2016-09-06 10:51:01 +03:00
Stian Thorgersen	7a66b055be	KEYCLOAK-3475 Call event handlers when initialized with tokens	2016-09-06 09:00:29 +02:00
Marek Posolda	e3ddc5a639	Merge pull request #3194 from mposolda/master KEYCLOAK-3525 Validation callback when creating/updating protocolMapper	2016-09-06 08:24:26 +02:00
mposolda	8c5b1e4892	KEYCLOAK-3525 Validation callback when creating/updating protocolMapper	2016-09-06 07:15:27 +02:00
Marek Posolda	ad1d3adb9e	Merge pull request #3196 from mposolda/fuse-zip KEYCLOAK-3526 Fuse adapter ZIP fix	2016-09-06 07:14:51 +02:00
mposolda	e18f3edbcd	KEYCLOAK-3526 Fuse adapter ZIP fix	2016-09-06 07:14:01 +02:00
Marek Posolda	6ede760725	Merge pull request #3083 from martin-kanis/master Package Fuse adapter as overlay zip	2016-09-06 05:44:27 +02:00
Marek Posolda	db0f05fb86	Merge pull request #3192 from mposolda/master KEYCLOAK-2957 IdpEmailVerificationAuthenticator should setEmailVerifi…	2016-09-05 23:03:03 +02:00
mposolda	03c05bd72b	KEYCLOAK-2957 IdpEmailVerificationAuthenticator should setEmailVerified to true after successfuly link user by email verification	2016-09-05 18:04:24 +02:00
Grégoire Paris	c867fcf9e7	Remove duplicate untranslated word	2016-09-05 17:12:21 +02:00
Stian Thorgersen	22e85b11eb	Merge pull request #3190 from vramik/KEYCLOAK-3489 KEYCLOAK-3489 Database migration testing	2016-09-05 15:19:24 +02:00
Vlasta Ramik	39fe439573	Database migration testing	2016-09-05 13:39:21 +02:00
Stian Thorgersen	fc6b7ea8ee	Enabled Norwegian translation	2016-09-05 09:45:44 +02:00
Stian Thorgersen	0e1edb3d7a	Merge pull request #3170 from TeliaSoneraNorge/issue/KEYCLOAK-3487-add-norwegian-localization Add Norwegian localization	2016-09-05 09:42:44 +02:00
Stian Thorgersen	7a77055e58	Merge pull request #3180 from mbaluch/master A class to generate a single jUnit XML file. This file will be co…	2016-09-05 09:37:33 +02:00
Stian Thorgersen	d9e95455a2	Merge pull request #3172 from mwcz/js-updateToken-withCredentials send cookies along with keycloak.updateToken()	2016-09-05 09:37:00 +02:00
Stian Thorgersen	f5b4efc080	Merge pull request #3131 from abstractj/removal-changeset Removal of never used classes from the changeset package	2016-09-05 09:35:08 +02:00
Stian Thorgersen	b1a233e41f	Merge branch 'feature-fix-time-selector' of https://github.com/ramunask/keycloak into ramunask-feature-fix-time-selector	2016-09-05 09:32:11 +02:00
Stian Thorgersen	4d6e656b02	Merge pull request #3150 from stoffus/bug-fix-in-reset-password-tpl KEYCLOAK-3441 Respect registrationEmailAsUsername in reset-password template	2016-09-05 09:10:49 +02:00
Stian Thorgersen	3354e7c98e	Merge pull request #3148 from wadahiro/KEYCLOAK-3435 KEYCLOAK-3435 Fix some minor issues in the Admin Console UI	2016-09-05 09:09:30 +02:00
Ramunas Kraujutis	05fe17be4f	merge latest English messages	2016-09-04 22:20:30 +03:00
Ramunas Kraujutis	2e9f14dfd8	Merge branch 'master-upstream' into feature-lithuanian-locale # Conflicts: # themes/src/main/resources/theme/base/account/messages/messages_en.properties # themes/src/main/resources/theme/base/account/theme.properties # themes/src/main/resources/theme/base/admin/theme.properties # themes/src/main/resources/theme/base/email/theme.properties # themes/src/main/resources/theme/base/login/theme.properties	2016-09-04 22:20:03 +03:00
Marek Posolda	404aa69adb	Merge pull request #3187 from mposolda/master KEYCLOAK-3349 Support for 'request' and 'request_uri' parameters	2016-09-02 21:58:25 +02:00
mposolda	a24a43c4be	KEYCLOAK-3349 Support for 'request' and 'request_uri' parameters	2016-09-02 20:20:38 +02:00
mposolda	892d5fd1b7	TestingExportImport in separate resource	2016-09-02 20:20:38 +02:00
Stian Thorgersen	258f7c8d60	Merge pull request #3176 from stianst/KEYCLOAK-3501 KEYCLOAK-3501 Fix NPE in migration of OTP action	2016-09-02 10:11:33 +02:00
Mohit Suman	b17bd9e660	Fixed dropdown menu in navigation bar in small screens	2016-09-02 01:37:10 +05:30
Pedro Igor	43d23835d0	Merge pull request #3179 from pedroigor/KEYCLOAK-3472 [KEYCLOAK-3472] - Multiple paths with the same name and tests	2016-09-01 10:00:33 -03:00
Mohit Suman	d11efa363c	Dropdown alignment with the empty state	2016-09-01 16:02:34 +05:30
Mohit Suman	8f0afb2551	Add empty state for Identitiy Provider in admin console	2016-09-01 15:36:17 +05:30
Marek Baluch	c874f96228	A class which generates a single junit xml file. This file will be consumed by Polarion	2016-09-01 10:18:06 +02:00
Pedro Igor	ce78cc1d1c	[KEYCLOAK-3472] - Multiple paths with the same name and tests	2016-08-31 21:04:36 -03:00
Marek Posolda	599c69a2a3	Merge pull request #3177 from vmuzikar/KEYCLOAK-3421 KEYCLOAK-3421 Validation for URI fragments in redirect_uri	2016-08-31 19:39:28 +02:00
Pedro Igor	9daced953e	Merge pull request #3157 from ramunask/feature-fix-en-translation KEYCLOAK-3463 fixed translation for authz-policy-decision-strategy.tooltip	2016-08-31 09:18:31 -03:00
Vaclav Muzikar	1b085d3e13	KEYCLOAK-3421 Validation for URI fragments in redirect_uri	2016-08-31 13:07:33 +02:00
Stian Thorgersen	1bea93b1e1	KEYCLOAK-3501 Fix NPE in migration of OTP action	2016-08-31 12:05:49 +02:00
Pedro Igor	16bd2fb8f8	Merge pull request #3175 from pedroigor/KEYCLOAK-3337 [KEYCLOAK-3337] - Support more specific date/time periods with the Time policy provider	2016-08-30 18:16:09 -03:00
Marek Posolda	e8efe10fc8	Merge pull request #3174 from mposolda/master KEYCLOAK-3416 Add support for signed Userinfo requests	2016-08-30 22:18:09 +02:00
Pedro Igor	73bcfba5f3	[KEYCLOAK-3337] - Support more specific date/time periods with the Time policy provider	2016-08-30 16:32:00 -03:00
mposolda	02f28a7e8e	KEYCLOAK-3416 Add support for signed Userinfo requests	2016-08-30 20:21:04 +02:00
Stian Thorgersen	5a4bb5f3f0	Merge pull request #3168 from stianst/master KEYCLOAK-3462 Fix exception not displayed in init from KeycloakServer	2016-08-30 09:47:31 +02:00
Marek Posolda	235623301e	Merge pull request #3171 from mposolda/master KEYCLOAK-3424	2016-08-29 16:24:54 +02:00
mposolda	f4aee129e4	KEYCLOAK-3424 Issuer or token-endpoint as audience in signed JWT	2016-08-29 14:43:35 +02:00
mposolda	a7f9a6e095	KEYCLOAK-3424 Support for import from public key	2016-08-29 14:43:29 +02:00
Caroline Olsen	539d9863aa	Add Norwegian localization KEYCLOAK-3487	2016-08-29 11:01:50 +02:00
Stian Thorgersen	4f51b7b34c	KEYCLOAK-3462 Fix exception not displayed in init from KeycloakServer	2016-08-29 09:21:22 +02:00
Stian Thorgersen	0e5af3710e	Merge pull request #3166 from ssilvert/dmr-config-dev-doc KEYCLOAK-3196: Update dev doc for keycloak subsystem configuration.	2016-08-29 08:12:28 +02:00
Stan Silvert	a462dd78bb	Update dev doc for keycloak subsystem configuration.	2016-08-26 16:40:34 -04:00
mwcz	ec5289b5c8	send cookies along with keycloak.updateToken()	2016-08-26 11:23:44 -04:00
Stian Thorgersen	2a29f2a9c6	Merge pull request #3151 from ssilvert/dmr-server-config KEYCLOAK-3196: Use WildFly management model for server configuration.	2016-08-26 13:44:45 +02:00
Stian Thorgersen	9ffd6548ce	Merge pull request #3146 from mhajas/KEYCLOAK-3161 KEYCLOAK-3161 Migrate SAML adapter tests	2016-08-26 13:40:58 +02:00
Stian Thorgersen	cfd41fbc8b	Merge pull request #3165 from StephenOTT/patch-1 typo fixes in Readme files	2016-08-26 13:40:12 +02:00
Stian Thorgersen	4c2cca4672	Merge pull request #3118 from wadahiro/issue/KEYCLOAK-3397-add-japanese-localization KEYCLOAK-3397 Add Japanese localization	2016-08-26 11:38:03 +02:00
Hiroyuki Wada	53557d9cfd	KEYCLOAK-3397 Fix Japanese translation	2016-08-26 10:46:45 +09:00
Stan Silvert	a0054bd77f	Merge pull request #1 from vramik/KEYCLOAK-3459 KEYCLOAK-3459 Adapt testsuite according to server configuration insid…	2016-08-25 07:21:34 -04:00
Vlasta Ramik	099de9e6e3	KEYCLOAK-3459 Adapt testsuite according to server configuration inside standalone.xml instead of keycloak-server.json	2016-08-25 12:36:39 +02:00
Stephen Russett	cfd61dc359	typo fix in google example readme	2016-08-24 23:45:52 -04:00
Stephen Russett	99f453b25c	typo fix	2016-08-24 23:40:21 -04:00
Stan Silvert	345163994a	KEYCLOAK-3196: Allow expressions in SPI properties.	2016-08-23 13:02:11 -04:00
Stan Silvert	09090cec24	KEYCLOAK-3196: Resolve conflicts. Port keycloak-server.json changes to xml and cli	2016-08-23 11:56:21 -04:00
Stan Silvert	3abcf713e5	KEYCLOAK-3196: Test need ability to load keycloak-server.json from /META-INF	2016-08-23 11:27:06 -04:00
Stan Silvert	e4d97485ec	KEYCLOAK-3196: Create master cli script for server-subsystem.	2016-08-23 11:27:04 -04:00
Stan Silvert	1489bd734a	KEYCLOAK-3196: Add CLI help text.	2016-08-23 11:27:01 -04:00
Stan Silvert	ef442cae92	KEYCLOAK-3196: Create single place to declare default keycloak subsystem config.	2016-08-23 11:26:58 -04:00
Stan Silvert	3493aa4ab7	KEYCLOAK-3196: Use WildFly management model for server configuration.	2016-08-23 11:26:56 -04:00
Ramunas Kraujutis	352602da39	change lt locale position to be ordered alphabetically	2016-08-22 19:12:03 +03:00
Ramunas Kraujutis	c333d1eaa9	change lt locale position to be ordered alphabetically	2016-08-22 19:10:20 +03:00
Ramunas Kraujutis	ee66cb51da	adding Lithuanian translation	2016-08-21 16:14:22 +03:00
Ramunas Kraujutis	93d65fa895	fix select options and add values to fix issues when non-English locale is used with translated values	2016-08-21 16:09:18 +03:00
Ramunas Kraujutis	6aafde7819	fixed translation for authz-policy-decision-strategy.tooltip changing "policy" to "permission"	2016-08-21 16:04:51 +03:00
Dimitri Teleguin	b109ce14b0	KEYCLOAK-3327 Make realm attributes accessible via the RealmModel	2016-08-18 23:28:32 +03:00
Bill Burke	561661d726	Merge remote-tracking branch 'upstream/master'	2016-08-18 13:13:28 -04:00
Bill Burke	6c44e9befa	Merge remote-tracking branch 'upstream/master'	2016-08-18 11:57:25 -04:00
Bill Burke	8e9cfc4a28	creds	2016-08-18 11:52:00 -04:00
Christopher Svensson	d20d5ce2d7	Bug fix: Respect registrationEmailAsUsername in reset-password template.	2016-08-18 10:24:37 +02:00
Christopher Svensson	243c8cc2cd	Merge remote-tracking branch 'keycloak/master'	2016-08-18 10:19:27 +02:00
Hiroyuki Wada	b34acd4cc2	KEYCLOAK-3397 Add Japanese localization	2016-08-16 20:44:47 +09:00
Hiroyuki Wada	85ac784fd0	KEYCLOAK-3435 Fix some minor issues in the Admin Console UI	2016-08-16 20:34:48 +09:00
mhajas	285a99d903	Migrate SAML adapter tests	2016-08-13 11:09:48 +02:00
Bruno Oliveira	4d8e19eb7c	Removal of never used classes from the changeset package	2016-08-10 17:28:38 -03:00
Martin Kanis	8ad3c3fb03	Package Fuse adapter as overlay zip	2016-07-29 11:16:05 +02:00