Fix dependency warnings

KPR-145
Remove keycloak-as7-adapter-dist zip from the distribution zip files

KPR-146
Remove keycloak-jetty81-adapter-dist zip from the distribution zip files

broker/core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/oidc/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

broker/saml/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client-registration/api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-client-registration-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

client-registration/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <name>Keycloak Client Registration Parent</name>

common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/http-client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/infinispan/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -27,6 +27,20 @@
             <artifactId>infinispan-core</artifactId>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling-river</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

connections/jpa-liquibase/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.8.0.xml

@@ -117,14 +117,8 @@
 
         <update tableName="CREDENTIAL">
             <column name="ALGORITHM" type="VARCHAR(36)" value="pbkdf2" />
-            <where>TYPE in ('password-history', 'password') AND ALGORITHM = 'HmacSHA1'</where>
+            <where>TYPE in ('password-history', 'password') AND ALGORITHM is 'HmacSHA1'</where>
         </update>
-
-        <!-- Sybase specific hacks -->
-        <modifySql dbms="sybase">
-            <regExpReplace replace=".*(SET DEFAULT NULL)" with="SELECT 1" />
-        </modifySql>
-
     </changeSet>
 
 </databaseChangeLog>

connections/jpa/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/mongo-update/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/mongo/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

connections/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
     <name>Connections Parent</name>
     <description/>
@@ -16,8 +16,8 @@
         <module>jpa</module>
         <module>jpa-liquibase</module>
         <module>infinispan</module>
-        <module>mongo</module>
-        <module>mongo-update</module>
+        <!--<module>mongo</module>-->
+        <!--<module>mongo-update</module>-->
         <module>http-client</module>
         <module>truststore</module>
     </modules>

connections/truststore/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

dependencies/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

dependencies/server-all/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.8.2.Final</version>
+		<version>1.8.0.CR2</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -120,7 +120,7 @@
         </dependency>
 
         <!-- mongo -->
-        <dependency>
+        <!-- <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-connections-mongo</artifactId>
         </dependency>
@@ -139,7 +139,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-        </dependency>
+        </dependency> -->
 
         <dependency>
             <groupId>org.liquibase</groupId>

dependencies/server-min/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.8.2.Final</version>
+		<version>1.8.0.CR2</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

distribution/adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml

@@ -6,10 +6,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>keycloak-parent</artifactId>
+        <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <version>1.8.0.CR2</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-as7-modules</artifactId>

distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml

@@ -2,10 +2,10 @@
          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>
+        <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <version>1.8.0.CR2</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-eap6-adapter-dist</artifactId>

distribution/adapters/as7-eap6-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -13,9 +13,21 @@
     <artifactId>keycloak-as7-eap6-adapter-dist-pom</artifactId>
     <packaging>pom</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>eap6-supported-artifacts</artifactId>
+                <version>${jboss.eap6.bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>as7-modules</module>
-        <module>as7-adapter-zip</module>
+        <!--<module>as7-adapter-zip</module>-->
         <module>eap6-adapter-zip</module>
     </modules>
 </project>

distribution/adapters/jetty81-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/jetty91-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/jetty92-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/js-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/osgi/features/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak OSGI Features</name>

distribution/adapters/osgi/jaas/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak OSGI JAAS Realm Configuration</name>

distribution/adapters/osgi/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak OSGI Integration</name>

distribution/adapters/osgi/thirdparty/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -16,15 +16,15 @@
 
     <modules>
         <module>as7-eap6-adapter</module>
-        <module>jetty81-adapter-zip</module>
-        <module>jetty91-adapter-zip</module>
-        <module>jetty92-adapter-zip</module>
+        <!--<module>jetty81-adapter-zip</module>-->
+        <!--<module>jetty91-adapter-zip</module>-->
+        <!--<module>jetty92-adapter-zip</module>-->
         <module>js-adapter-zip</module>
         <module>osgi</module>
-        <module>tomcat6-adapter-zip</module>
-        <module>tomcat7-adapter-zip</module>
-        <module>tomcat8-adapter-zip</module>
-        <module>wf8-adapter</module>
+        <!--<module>tomcat6-adapter-zip</module>-->
+        <!--<module>tomcat7-adapter-zip</module>-->
+        <!--<module>tomcat8-adapter-zip</module>-->
+        <!--<module>wf8-adapter</module>-->
         <module>wildfly-adapter</module>
     </modules>
 </project>

distribution/adapters/tomcat6-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/tomcat7-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/tomcat8-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/wf8-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak Wildfly 8 Adapter</name>

distribution/adapters/wf8-adapter/wf8-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/wf8-adapter/wf8-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/wildfly-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak Wildfly Adapter</name>

distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/demo-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/docs-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/downloads/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>distribution-pom</artifactId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <artifactId>keycloak-dist-downloads</artifactId>

distribution/examples-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/feature-packs/adapter-feature-pack/pom.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 ~ JBoss, Home of Professional Open Source.
 ~ Copyright 2015 Red Hat, Inc., and individual contributors
@@ -15,12 +16,11 @@
 ~ 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">
+<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">
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>feature-packs-parent</artifactId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -57,7 +57,7 @@
             <artifactId>keycloak-undertow-adapter</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wildfly</groupId>
+            <groupId>org.jboss.eap</groupId>
             <artifactId>wildfly-feature-pack</artifactId>
             <type>zip</type>
         </dependency>
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <executions></executions>
+                <executions/>
             </plugin>
             <plugin>
                 <groupId>org.wildfly.build</groupId>

distribution/feature-packs/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>distribution-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Feature Pack Builds</name>
@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>adapter-feature-pack</module>
+<!--        <module>adapter-feature-pack</module>-->
         <module>server-feature-pack</module>
     </modules>
 </project>

distribution/feature-packs/server-feature-pack/feature-pack-build.xml

@@ -22,7 +22,7 @@
 
 <build xmlns="urn:wildfly:feature-pack-build:1.1">
     <dependencies>
-        <artifact name="org.wildfly:wildfly-feature-pack" />
+        <artifact name="org.jboss.eap:wildfly-feature-pack" />
     </dependencies>
     <config>
         <standalone template="configuration/standalone/template.xml" subsystems="configuration/standalone/subsystems.xml" output-file="standalone/configuration/standalone.xml" />

distribution/feature-packs/server-feature-pack/pom.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 ~ JBoss, Home of Professional Open Source.
 ~ Copyright 2015 Red Hat, Inc., and individual contributors
@@ -15,12 +16,11 @@
 ~ 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">
+<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">
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>feature-packs-parent</artifactId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -49,7 +49,7 @@
             <artifactId>keycloak-wildfly-server-subsystem</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wildfly</groupId>
+            <groupId>org.jboss.eap</groupId>
             <artifactId>wildfly-feature-pack</artifactId>
             <type>zip</type>
         </dependency>
@@ -64,7 +64,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <executions></executions>
+                <executions/>
             </plugin>
             <plugin>
                 <groupId>org.wildfly.build</groupId>

distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/product.conf

@@ -1 +1 @@
-slot=keycloak
+slot=rh-sso

distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json

@@ -31,7 +31,7 @@
     },
 
     "theme": {
-        "default": "keycloak",
+        "default": "rh-sso",
         "staticMaxAge": 2592000,
         "cacheTemplates": true,
         "cacheThemes": true,
@@ -60,4 +60,4 @@
             "cacheContainer" : "java:comp/env/infinispan/Keycloak"
         }
     }
-}
+}

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/product/rh-sso/dir/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 JBoss-Product-Release-Name: ${product.name}
 JBoss-Product-Release-Version: ${product.version}
-JBoss-Product-Console-Slot: main
+JBoss-Product-Console-Slot: eap

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/product/rh-sso/module.xml

@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="keycloak">
+<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="rh-sso">
 
     <resources>
         <resource-root path="dir"/>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo-update/main/module.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-connections-mongo-update">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-connections-mongo-update}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-mongo/main/module.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-connections-mongo">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-connections-mongo}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-events-mongo">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-events-mongo}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-events-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-model-mongo/main/module.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-model-mongo">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-model-mongo}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml

@@ -6,8 +6,8 @@
             <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-connections-jpa" services="import" meta-inf="import"/>
             <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
-            <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
-            <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>
+            <!--<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+            <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>-->
             <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
             <module name="org.keycloak.keycloak-common" services="import"/>
             <module name="org.keycloak.keycloak-core" services="import"/>
@@ -17,7 +17,7 @@
             <module name="org.keycloak.keycloak-events-email" services="import"/>
             <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
             <module name="org.keycloak.keycloak-events-jpa" services="import"/>
-            <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+            <!--<module name="org.keycloak.keycloak-events-mongo" services="import"/>-->
             <module name="org.keycloak.keycloak-export-import-api" services="import"/>
             <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
             <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
@@ -32,7 +32,7 @@
             <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
             <module name="org.keycloak.keycloak-model-api" services="import"/>
             <module name="org.keycloak.keycloak-model-jpa" services="import"/>
-            <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+            <!--<module name="org.keycloak.keycloak-model-mongo" services="import"/>-->
             <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
             <module name="org.keycloak.keycloak-services" export="true" services="import"/>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml

@@ -16,8 +16,8 @@
         <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
         <module name="org.keycloak.keycloak-connections-jpa" services="import"/>
         <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
-        <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
-        <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>
+        <!--<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+        <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>-->
         <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
         <module name="org.keycloak.keycloak-common" services="import"/>
         <module name="org.keycloak.keycloak-core" services="import"/>
@@ -27,7 +27,7 @@
         <module name="org.keycloak.keycloak-events-email" services="import"/>
         <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
         <module name="org.keycloak.keycloak-events-jpa" services="import"/>
-        <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+<!--        <module name="org.keycloak.keycloak-events-mongo" services="import"/>-->
         <module name="org.keycloak.keycloak-export-import-api" services="import"/>
         <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
         <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
@@ -42,7 +42,7 @@
         <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
         <module name="org.keycloak.keycloak-model-api" services="import"/>
         <module name="org.keycloak.keycloak-model-jpa" services="import"/>
-        <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+<!--        <module name="org.keycloak.keycloak-model-mongo" services="import"/>-->
         <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
         <module name="org.keycloak.keycloak-saml-core" services="import"/>
         <module name="org.keycloak.keycloak-saml-protocol" services="import"/>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/mongodb/mongo-java-driver/main/module.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.mongodb.mongo-java-driver">
-    <resources>
-        <artifact name="${org.mongodb:mongo-java-driver}"/>
-    </resources>
-    <dependencies>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,10 +17,10 @@
     <modules>
         <module>adapters</module>
         <module>saml-adapters</module>
-        <module>demo-dist</module>
-        <module>docs-dist</module>
+        <!--<module>demo-dist</module>-->
+        <!--<module>docs-dist</module>-->
         <module>examples-dist</module>
-        <module>proxy-dist</module>
+        <!--<module>proxy-dist</module>-->
         <module>server-dist</module>
         <module>server-overlay</module>
         <module>src-dist</module>

distribution/proxy-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/as7-eap6-adapter/as7-modules/pom.xml

@@ -6,10 +6,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>keycloak-parent</artifactId>
+        <artifactId>keycloak-saml-as7-eap6-adapter-dist-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <version>1.8.0.CR2</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-saml-as7-modules</artifactId>

distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml

@@ -2,10 +2,10 @@
          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>
+        <artifactId>keycloak-saml-as7-eap6-adapter-dist-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <version>1.8.0.CR2</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>keycloak-saml-eap6-adapter-dist</artifactId>

distribution/saml-adapters/as7-eap6-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak SAML AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -13,9 +13,21 @@
     <artifactId>keycloak-saml-as7-eap6-adapter-dist-pom</artifactId>
     <packaging>pom</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>eap6-supported-artifacts</artifactId>
+                <version>${jboss.eap6.bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>as7-modules</module>
-        <module>as7-adapter-zip</module>
+        <!--<module>as7-adapter-zip</module>-->
         <module>eap6-adapter-zip</module>
     </modules>
 </project>

distribution/saml-adapters/jetty81-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/jetty92-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -16,13 +16,13 @@
 
     <modules>
         <module>wildfly-adapter</module>
-        <module>tomcat6-adapter-zip</module>
-        <module>tomcat7-adapter-zip</module>
-        <module>tomcat8-adapter-zip</module>
-        <module>jetty81-adapter-zip</module>
+        <!--<module>tomcat6-adapter-zip</module>-->
+        <!--<module>tomcat7-adapter-zip</module>-->
+        <!--<module>tomcat8-adapter-zip</module>-->
+        <!--<module>jetty81-adapter-zip</module>-->
         <!-- jetty 9.1 doesn't work right now
         <module>jetty91-adapter-zip</module> -->
-        <module>jetty92-adapter-zip</module>
+        <!--<module>jetty92-adapter-zip</module>-->
         <module>as7-eap6-adapter</module>
     </modules>
 </project>

distribution/saml-adapters/tomcat6-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/tomcat7-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/tomcat8-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/wildfly-adapter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <name>Keycloak Wildfly SAML Adapter</name>

distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/server-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

distribution/server-overlay/eap6/eap6-server-modules/build.xml

@@ -264,7 +264,7 @@
 
         <!-- mongo -->
 
-        <module-def name="org.keycloak.keycloak-connections-mongo">
+        <!--<module-def name="org.keycloak.keycloak-connections-mongo">
             <maven-resource group="org.keycloak" artifact="keycloak-connections-mongo"/>
         </module-def>
 
@@ -282,7 +282,7 @@
 
         <module-def name="org.mongodb.mongo-java-driver">
             <maven-resource group="org.mongodb" artifact="mongo-java-driver"/>
-        </module-def>
+        </module-def>-->
 
         <module-def name="org.liquibase">
             <maven-resource group="org.liquibase" artifact="liquibase-core"/>

distribution/server-overlay/eap6/eap6-server-modules/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo-update/main/module.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-connections-mongo-update">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-connections-mongo/main/module.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-connections-mongo">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-eap6-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml

@@ -6,8 +6,8 @@
             <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-connections-jpa" services="import" meta-inf="import"/>
             <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
-            <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
-            <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>
+            <!--<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+            <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>-->
             <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
             <module name="org.keycloak.keycloak-common" services="import"/>
             <module name="org.keycloak.keycloak-core" services="import"/>
@@ -17,7 +17,7 @@
             <module name="org.keycloak.keycloak-events-email" services="import"/>
             <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
             <module name="org.keycloak.keycloak-events-jpa" services="import"/>
-            <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+            <!--<module name="org.keycloak.keycloak-events-mongo" services="import"/>-->
             <module name="org.keycloak.keycloak-export-import-api" services="import"/>
             <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
             <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
@@ -32,7 +32,7 @@
             <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
             <module name="org.keycloak.keycloak-model-api" services="import"/>
             <module name="org.keycloak.keycloak-model-jpa" services="import"/>
-            <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+            <!--<module name="org.keycloak.keycloak-model-mongo" services="import"/>-->
             <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
             <module name="org.keycloak.keycloak-saml-protocol" services="import"/>
             <module name="org.keycloak.keycloak-services" export="true" services="import"/>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-events-mongo/main/module.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-events-mongo">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-events-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.codehaus.jackson.jackson-core-asl"/>
-        <module name="org.codehaus.jackson.jackson-mapper-asl"/>
-        <module name="org.codehaus.jackson.jackson-xc"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-model-mongo/main/module.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-model-mongo">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-model-api"/>
-        <module name="org.keycloak.keycloak-connections-mongo"/>
-        <module name="org.mongodb.mongo-java-driver"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml

@@ -16,8 +16,8 @@
         <module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
         <module name="org.keycloak.keycloak-connections-jpa" services="import"/>
         <module name="org.keycloak.keycloak-connections-jpa-liquibase" services="import"/>
-        <module name="org.keycloak.keycloak-connections-mongo" services="import"/>
-        <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>
+        <!--<module name="org.keycloak.keycloak-connections-mongo" services="import"/>
+        <module name="org.keycloak.keycloak-connections-mongo-update" services="import"/>-->
         <module name="org.keycloak.keycloak-connections-truststore" services="import"/>
         <module name="org.keycloak.keycloak-common" services="import"/>
         <module name="org.keycloak.keycloak-core" services="import"/>
@@ -27,7 +27,7 @@
         <module name="org.keycloak.keycloak-events-email" services="import"/>
         <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
         <module name="org.keycloak.keycloak-events-jpa" services="import"/>
-        <module name="org.keycloak.keycloak-events-mongo" services="import"/>
+        <!--<module name="org.keycloak.keycloak-events-mongo" services="import"/>-->
         <module name="org.keycloak.keycloak-export-import-api" services="import"/>
         <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
         <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
@@ -42,7 +42,7 @@
         <module name="org.keycloak.keycloak-login-freemarker" services="import"/>
         <module name="org.keycloak.keycloak-model-api" services="import"/>
         <module name="org.keycloak.keycloak-model-jpa" services="import"/>
-        <module name="org.keycloak.keycloak-model-mongo" services="import"/>
+        <!--<module name="org.keycloak.keycloak-model-mongo" services="import"/>-->
         <module name="org.keycloak.keycloak-model-sessions-infinispan" services="import"/>
 
         <module name="org.keycloak.keycloak-saml-core" services="import"/>

distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/mongodb/mongo-java-driver/main/module.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.1" name="org.mongodb.mongo-java-driver">
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>

distribution/server-overlay/eap6/eap6-server-overlay/cli/keycloak-install-ha.cli

@@ -5,7 +5,6 @@
 /subsystem=infinispan/cache-container=keycloak/invalidation-cache=realms:add(mode="SYNC")
 /subsystem=infinispan/cache-container=keycloak/invalidation-cache=users:add(mode="SYNC")
 /subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:add(mode="SYNC",owners="1")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions:add(mode="SYNC",owners="1")
 /subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:add(mode="SYNC",owners="1")
 /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
 /subsystem=keycloak-server:add(web-context=auth)

distribution/server-overlay/eap6/eap6-server-overlay/cli/keycloak-install.cli

@@ -4,7 +4,6 @@
 /subsystem=infinispan/cache-container=keycloak/local-cache=realms:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=users:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=sessions:add()
-/subsystem=infinispan/cache-container=keycloak/local-cache=offlineSessions:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=loginFailures:add()
 /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
 /subsystem=keycloak-server:add(web-context=auth)

distribution/server-overlay/eap6/eap6-server-overlay/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 

distribution/server-overlay/eap6/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/server-overlay/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -16,6 +16,6 @@
 
     <modules>
         <module>wildfly</module>
-        <module>eap6</module>
+        <!--<module>eap6</module>-->
     </modules>
 </project>

distribution/server-overlay/wildfly/cli/keycloak-install-ha.cli

@@ -1,10 +0,0 @@
-/subsystem=datasources/data-source=KeycloakDS/:add(connection-url="jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE",driver-name=h2,jndi-name=java:jboss/datasources/KeycloakDS,password=sa,user-name=sa,use-java-context=true,enabled=true)
-/subsystem=infinispan/cache-container=keycloak:add(jndi-name="infinispan/Keycloak")
-/subsystem=infinispan/cache-container=keycloak/transport=TRANSPORT:add(lock-timeout=60000)
-/subsystem=infinispan/cache-container=keycloak/invalidation-cache=realms:add(mode="SYNC")
-/subsystem=infinispan/cache-container=keycloak/invalidation-cache=users:add(mode="SYNC")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:add(mode="SYNC",owners="1")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions:add(mode="SYNC",owners="1")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:add(mode="SYNC",owners="1")
-/extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
-/subsystem=keycloak-server:add(web-context=auth)

distribution/server-overlay/wildfly/cli/keycloak-install.cli

@@ -3,7 +3,6 @@
 /subsystem=infinispan/cache-container=keycloak/local-cache=realms:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=users:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=sessions:add()
-/subsystem=infinispan/cache-container=keycloak/local-cache=offlineSessions:add()
 /subsystem=infinispan/cache-container=keycloak/local-cache=loginFailures:add()
 /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
 /subsystem=keycloak-server:add(web-context=auth)

distribution/server-overlay/wildfly/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

distribution/src-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

docbook/auth-server-docs/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-docbook-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

docbook/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Keycloak Documentation</name>

docbook/saml-adapter-docs/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-docbook-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

docbook/saml-adapter-docs/reference/en/en-US/modules/adapter-config.xml

@@ -375,10 +375,10 @@
             </variablelist>
         </para>
     </section>    <section>
-    <title>IDP SingleLogoutService sub element</title>
+    <title>IDP SingleSignOnService sub element</title>
     <para>
-        The <literal>SingleLogoutService</literal> sub element defines the
-        logout SAML endpoint of the IDP.
+        The <literal>SignleSignOnService</literal> sub element defines the
+        login SAML endpoint of the IDP.
     </para>
     <programlisting><![CDATA[
 <SingleLogoutService validateRequestSignature="true"

events/api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-events-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.8.2.Final</version>
+        <version>1.8.0.CR2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>