Set version to 1.8.0.CR3

Merge pull request #2088 from patriot1burke/1.8.x
KEYCLOAK-2373 KEYCLOAK-2376
2016-01-22 12:05:50 +00:00 · 2016-01-21 21:30:07 -05:00 · 2016-01-21 20:26:41 -05:00 · 2016-01-21 20:22:25 +01:00 · 2016-01-21 19:48:20 +01:00 · 2016-01-21 16:20:44 +01:00
299 changed files with 816 additions and 438 deletions
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-client-registration-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Keycloak Client Registration Parent</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -111,4 +111,14 @@
        </update>

    </changeSet>
+
+    <changeSet id="1.8.0-2" author="keycloak">
+        <dropDefaultValue tableName="CREDENTIAL" columnName="ALGORITHM" columnDataType="VARCHAR(36)"/>
+
+        <update tableName="CREDENTIAL">
+            <column name="ALGORITHM" type="VARCHAR(36)" value="pbkdf2" />
+            <where>TYPE in ('password-history', 'password') AND ALGORITHM = 'HmacSHA1'</where>
+        </update>
+    </changeSet>
+
 </databaseChangeLog>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>
    <name>Connections Parent</name>
    <description/>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.8.0.CR1-SNAPSHOT</version>
+		<version>1.8.0.CR3</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -94,6 +94,10 @@
            <groupId>org.keycloak</groupId>
            <artifactId>keycloak-social-stackoverflow</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-social-microsoft</artifactId>
+        </dependency>

        <!-- ldap federation api -->
        <dependency>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.8.0.CR1-SNAPSHOT</version>
+		<version>1.8.0.CR3</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>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI Features</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI JAAS Realm Configuration</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI Integration</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Wildfly 8 Adapter</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Wildfly Adapter</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>distribution-pom</artifactId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <artifactId>keycloak-dist-downloads</artifactId>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>feature-packs-parent</artifactId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>distribution-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Feature Pack Builds</name>
@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>feature-packs-parent</artifactId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -43,6 +43,7 @@
            <module name="org.keycloak.keycloak-social-twitter" services="import"/>
            <module name="org.keycloak.keycloak-social-linkedin" services="import"/>
            <module name="org.keycloak.keycloak-social-stackoverflow" services="import"/>
+            <module name="org.keycloak.keycloak-social-microsoft" services="import"/>
            <module name="org.keycloak.keycloak-timer-api" services="import"/>
            <module name="org.keycloak.keycloak-timer-basic" services="import"/>
            <module name="org.hibernate" services="import"/>
@@ -54,6 +54,7 @@
        <module name="org.keycloak.keycloak-social-twitter" services="import"/>
        <module name="org.keycloak.keycloak-social-linkedin" services="import"/>
        <module name="org.keycloak.keycloak-social-stackoverflow" services="import"/>
+        <module name="org.keycloak.keycloak-social-microsoft" services="import"/>
        <module name="org.keycloak.keycloak-timer-api" services="import"/>
        <module name="org.keycloak.keycloak-timer-basic" services="import"/>
        <module name="org.keycloak.keycloak-wildfly-extensions" services="import"/>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-social-microsoft">
+    <resources>
+        <artifact name="${org.keycloak:keycloak-social-microsoft}"/>
+    </resources>
+    <dependencies>
+        <module name="org.keycloak.keycloak-common"/>
+        <module name="org.keycloak.keycloak-core"/>
+        <module name="org.keycloak.keycloak-social-core"/>
+        <module name="org.keycloak.keycloak-broker-core"/>
+        <module name="org.keycloak.keycloak-broker-oidc"/>
+        <module name="org.keycloak.keycloak-model-api"/>
+        <module name="org.jboss.logging"/>
+        <module name="javax.api"/>
+        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="org.codehaus.jackson.jackson-xc"/>
+    </dependencies>
+
+</module>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Wildfly SAML Adapter</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -236,6 +236,10 @@
      	<module-def name="org.keycloak.keycloak-social-stackoverflow">
    	      <maven-resource group="org.keycloak" artifact="keycloak-social-stackoverflow"/>
    	  </module-def>
+    	
+    	  <module-def name="org.keycloak.keycloak-social-microsoft">
+    	    	      <maven-resource group="org.keycloak" artifact="keycloak-social-microsoft"/>
+    	  </module-def>

        <module-def name="org.keycloak.keycloak-kerberos-federation">
            <maven-resource group="org.keycloak" artifact="keycloak-kerberos-federation"/>
@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -43,6 +43,7 @@
            <module name="org.keycloak.keycloak-social-twitter" services="import"/>
            <module name="org.keycloak.keycloak-social-linkedin" services="import"/>
            <module name="org.keycloak.keycloak-social-stackoverflow" services="import"/>
+            <module name="org.keycloak.keycloak-social-microsoft" services="import"/>
            <module name="org.keycloak.keycloak-timer-api" services="import"/>
            <module name="org.keycloak.keycloak-timer-basic" services="import"/>
            <module name="org.hibernate" services="import"/>
@@ -55,6 +55,7 @@
        <module name="org.keycloak.keycloak-social-twitter" services="import"/>
        <module name="org.keycloak.keycloak-social-linkedin" services="import"/>
        <module name="org.keycloak.keycloak-social-stackoverflow" services="import"/>
+        <module name="org.keycloak.keycloak-social-microsoft" services="import"/>
        <module name="org.keycloak.keycloak-timer-api" services="import"/>
        <module name="org.keycloak.keycloak-timer-basic" services="import"/>
        <module name="org.keycloak.keycloak-wildfly-extensions" services="import"/>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-social-microsoft">
+    <resources>
+        <!-- Insert resources here -->
+    </resources>
+    <dependencies>
+        <module name="org.keycloak.keycloak-common"/>
+        <module name="org.keycloak.keycloak-core"/>
+        <module name="org.keycloak.keycloak-social-core"/>
+        <module name="org.keycloak.keycloak-broker-core"/>
+        <module name="org.keycloak.keycloak-broker-oidc"/>
+        <module name="org.keycloak.keycloak-model-api"/>
+        <module name="org.jboss.logging"/>
+        <module name="javax.api"/>
+        <module name="org.codehaus.jackson.jackson-core-asl"/>
+        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+        <module name="org.codehaus.jackson.jackson-xc"/>
+    </dependencies>
+
+</module>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-docbook-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -211,7 +211,7 @@
                    <para>
                        Social providers allows you to enable social authentication to your realm.
                        Keycloak makes it easy to let users log in to your application using an existing account with a social network.
-                        Currently Facebook, Google, Twitter, GitHub, LinkedIn and StackOverflow are supported with more planned for the future.
+                        Currently Facebook, Google, Twitter, GitHub, LinkedIn, Microsoft and StackOverflow are supported with more planned for the future.
                    </para>
                </listitem>
            </varlistentry>
@@ -357,7 +357,7 @@
            So is trying to remember yet another username and password combination.
            Social identity providers makes it easy for users to register on your realm and quickly sign in using a social network.
            Keycloak provides built-in support for the most common social networks out there, such as Google, Facebook, Twitter,
-            Github, LinkedId and StackOverflow.
+            Github, LinkedId, Microsoft and StackOverflow.
        </para>

        <section>
@@ -855,6 +855,95 @@
                </tgroup>
            </table>
        </section>
+        <section>
+            <title>Microsoft</title>
+            <para>
+                To enable login with Microsoft account you first have to register an OAuth application on
+                <ulink url="https://account.live.com/developers/applications/index">Microsoft account Developer Center</ulink>. Then you need to copy the client id and secret into the Keycloak Admin Console.
+            </para>
+            <para>
+                Let's see first how to create an application with Microsoft.
+            </para>
+            <orderedlist>
+                <listitem>
+                    <para>
+                        Go to <ulink url="https://account.live.com/developers/applications/create">create new application on Microsoft account Developer Center</ulink> url and login here. 
+                        Use any value for <literal>Application Name</literal>, <literal>Application Logo</literal> and <literal>URLs</literal> you want.
+                        In <literal>API Settings</literal> set <literal>Target Domain</literal> to the domain where your Keycloak instance runs.
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        Copy <literal>Client Id</literal> and <literal>Client Secret</literal> from <literal>App Settings</literal> page.
+                    </para>
+                </listitem>
+            </orderedlist>
+            <para>
+                Now that you have the client id and secret you can proceed with the creation of a Microsoft Identity Provider in Keycloak. As follows:
+            </para>
+            <orderedlist>
+                <listitem>
+                    <para>
+                        Select the <literal>Microsoft</literal> identity provider from the drop-down box on the top right corner of the identity providers table in Keycloak's Admin Console. You should be presented with a specific page to configure the selected provided.
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        Copy the client id and client secret to their corresponding fields in the Keycloak Admin Console. Click <literal>Save</literal>.
+                    </para>
+                </listitem>
+            </orderedlist>
+            <para>
+                Once you create the identity provider in Keycloak, you must update your Microsoft application with the redirect url that was
+                generated to your identity provider.
+            </para>
+            <orderedlist>
+                <listitem>
+                    <para>
+                        Open the Microsoft account Developer Center and select <literal>API Settings</literal> of your application. In <literal>Redirect URLs</literal>
+                        insert the redirect uri created by Keycloak. The redirect uri
+                        usually have the following format: <literal>http://{host}:{port}/auth/realms/{realm}/broker/microsoft/endpoint</literal>.
+                    </para>
+                </listitem>
+            </orderedlist>
+            <note>
+                <para>
+                    You can always get the redirect url for a specific identity provider from the table presented when you
+                    click on the 'Identity Provider' tab in <emphasis>Realm > Settings</emphasis>.
+                </para>
+            </note>
+            <para>
+                That is it! This pretty much what you need to do in order to setup this identity provider.
+            </para>
+             <para>
+                The table below lists some additional configuration options you may use when configuring this provider.
+            </para>
+            <table>
+                <title>Configuration Options</title>
+                <tgroup align="left" cols="2">
+                    <thead>
+                        <row>
+                            <entry>
+                                Configuration
+                            </entry>
+                            <entry>
+                                Description
+                            </entry>
+                        </row>
+                    </thead>
+                    <tbody valign="top">
+                        <row>
+                            <entry>
+                                <literal>Default Scopes</literal>
+                            </entry>
+                            <entry>
+                                Allows you to manually specify the scopes that users must authorize when authenticating with this provider. For a complete list of scopes, please take a look at <ulink url="https://msdn.microsoft.com/en-us/library/hh243646.aspx">https://msdn.microsoft.com/en-us/library/hh243646.aspx</ulink>. By default, Keycloak uses the following scopes: <literal>wl.basic,wl.emails</literal>
+                            </entry>
+                        </row>
+                    </tbody>
+                </tgroup>
+            </table>
+        </section>
        <section>
            <title>StackOverflow</title>
            <para>
@@ -1282,7 +1371,7 @@ keycloak.createLoginUrl({
    <section>
        <title>Mapping/Importing User profile data from Social Identity Provider</title>
        <para>
-            You can import user profile data provided by social identity providers like Google, GitHub, LinkedIn, Stackoverflow and Facebook 
+            You can import user profile data provided by social identity providers like Google, GitHub, LinkedIn, Microsoft, Stackoverflow and Facebook 
            into new Keycloak user created from given social accounts. After you configure a broker, you'll see a <literal>Mappers</literal>
            button appear. Click on that and you'll get to the list of mappers that are assigned to this broker. There is a
            <literal>Create</literal> button on this page. Clicking on this create button allows you to create a broker mapper.
@@ -234,6 +234,8 @@ new Keycloak({ url: 'http://localhost/auth', realm: 'myrealm', clientId: 'myApp'
                        <listitem>onLoad - specifies an action to do on load, can be either 'login-required' or 'check-sso'</listitem>
                        <listitem>token - set an initial value for the token</listitem>
                        <listitem>refreshToken - set an initial value for the refresh token</listitem>
+                        <listitem>idToken - set an initial value for the id token (only together with token or refreshToken)</listitem>
+                        <listitem>timeSkew - set an initial value for skew between local time and Keycloak server in seconds (only together with token or refreshToken)</listitem>
                        <listitem>checkLoginIframe - set to enable/disable monitoring login state (default is true)</listitem>
                        <listitem>checkLoginIframeInterval - set the interval to check login state (default is 5 seconds)</listitem>
                        <listitem>responseMode - set the OpenID Connect response mode send to Keycloak server at login request. Valid values are <literal>query</literal> or <literal>fragment</literal> .
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Keycloak Documentation</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-docbook-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>keycloak-examples-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Keycloak Examples - Admin Client</name>
@@ -6,7 +6,7 @@
    <parent>
        <artifactId>keycloak-examples-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Keycloak Examples - Basic Auth</name>
@@ -6,7 +6,7 @@
    <parent>
        <artifactId>keycloak-examples-broker-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Keycloak Broker Examples - Facebook Authentication</name>
@@ -6,7 +6,7 @@
    <parent>
        <artifactId>keycloak-examples-broker-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Keycloak Broker Examples - Google Authentication</name>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-examples-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Broker Examples</name>
@@ -6,7 +6,7 @@
    <parent>
        <artifactId>keycloak-examples-broker-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Keycloak Broker Examples - SAML Identity Provider Brokering</name>
@@ -6,7 +6,7 @@
    <parent>
        <artifactId>keycloak-examples-broker-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Keycloak Broker Examples - Twitter Authentication</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-examples-cors-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-examples-cors-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-examples-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.8.0.CR1-SNAPSHOT</version>
+        <version>1.8.0.CR3</version>
    </parent>

    <name>Keycloak Examples - CORS</name>
Author	SHA1	Message	Date
keycloak-bot	b46cd7a6c6	Set version to 1.8.0.CR3	2016-01-22 12:05:50 +00:00
Bill Burke	f357310f40	Merge pull request #2088 from patriot1burke/1.8.x KEYCLOAK-2373 KEYCLOAK-2376	2016-01-21 21:30:07 -05:00
Bill Burke	f21d620e02	KEYCLOAK-2373 KEYCLOAK-2376	2016-01-21 20:26:41 -05:00
Stian Thorgersen	4ba7846ede	Merge pull request #2086 from stianst/1.8.x Fixed sql syntax error in credential migration script	2016-01-21 20:22:25 +01:00
Moritz Becker	0a39521581	Fixed sql syntax error in credential migration script	2016-01-21 19:48:20 +01:00
Stian Thorgersen	030786ce55	Merge pull request #2083 from stianst/1.8.x client UI fix	2016-01-21 16:20:44 +01:00
Moritz Becker	6287e89acd	client UI fix	2016-01-21 16:20:09 +01:00
Stian Thorgersen	ad64f42266	Merge pull request #2076 from stianst/1.8.x Version bump	2016-01-21 12:37:41 +01:00
Stian Thorgersen	53d6953c9f	Version bump	2016-01-21 12:07:14 +01:00
Stian Thorgersen	b2f9775da5	Merge pull request #2066 from stianst/1.8.x KEYCLOAK-2346 Add identity provider and external username to event wh…	2016-01-20 13:00:15 +01:00
Stian Thorgersen	40bb68e265	Merge pull request #2058 from velias/KEYCLOAK-2348-1_8 KEYCLOAK-2348 - Social login provider for Microsoft Live account for	2016-01-20 10:35:29 +01:00
Stian Thorgersen	dacb1ebd50	KEYCLOAK-2346 Add identity provider and external username to event when login via broker	2016-01-20 10:23:22 +01:00
Vlastimil Elias	063f2aa486	RHD-1382 - review comments resolved	2016-01-20 08:57:14 +01:00
Vlastimil Elias	4f9e641fda	KEYCLOAK-2348 - Social login provider for Microsoft Live account for Keycloak 1.8 branch	2016-01-19 16:40:38 +01:00
Stian Thorgersen	1f9ec6a907	Merge pull request #2057 from stianst/1.8.x KEYCLOAK-2344	2016-01-19 13:35:45 +01:00
Stian Thorgersen	2648d0f1c5	KEYCLOAK-2344 Realm Display Name is not used in verification e-mail	2016-01-19 13:02:45 +01:00
Stian Thorgersen	1dfe480c59	Merge pull request #2043 from stianst/1.8.x [KEYCLOAK-2336] - Support ECP clients using SOAP 1.1	2016-01-18 19:16:57 +01:00
Stian Thorgersen	6b242b26a9	Version bump	2016-01-18 14:49:24 +01:00
Stian Thorgersen	7b77cd7d1f	KEYCLOAK-2313 Add getName, getDisplayName, getDisplayNameHtml to account RealmBean	2016-01-18 14:42:32 +01:00
Pedro Igor	8a0c53bf1d	[KEYCLOAK-2336] - Support ECP clients using SOAP 1.1	2016-01-18 14:38:25 +01:00
Stian Thorgersen	a262d2263e	Merge pull request #2040 from stianst/1.8.x KEYCLOAK-2319	2016-01-18 14:37:27 +01:00
Stian Thorgersen	bf548945db	KEYCLOAK-2319 Cannot login to admin console after upgrade 1.6 -> 1.8.CR1	2016-01-18 12:31:21 +01:00
Bill Burke	fd2c3996e2	Merge pull request #2037 from ccheneau/1.8.x French translation updates for keycloak 1.8	2016-01-15 17:32:06 -05:00
ccheneau	ab81456fb3	French translations updates for keycloak 1.8	2016-01-15 20:57:00 +01:00
Alexander Schwartz	e9445cfc20	set timeSkew when passing tokens to init(), also allow timeSkew to be passed as a parameter / KEYCLOAK-2322	2016-01-15 16:39:24 +01:00