keycloak-developers

diff --git a/distribution/feature-pack-builds/adapter-only/adapter-only-build/server-provisioning.xml b/distribution/feature-pack-builds/adapter-only/adapter-only-build/server-provisioning.xml
index d8b8457..13de0ef 100644
--- a/distribution/feature-pack-builds/adapter-only/adapter-only-build/server-provisioning.xml
+++ b/distribution/feature-pack-builds/adapter-only/adapter-only-build/server-provisioning.xml
@@ -18,7 +18,7 @@
 <server-provisioning xmlns="urn:wildfly:server-provisioning:1.0">
     <feature-packs>
         <!-- uncomment wildfly-feature-pack to build against wildfly full instead of wildfly web -->
-        <!--<feature-pack groupId="org.wildfly" artifactId="wildfly-feature-pack" version="${wildfly9.version}"/>-->
+        <!--<feature-pack groupId="org.wildfly" artifactId="wildfly-feature-pack" version="${wildfly.version}"/>-->
         
         <feature-pack groupId="org.keycloak" artifactId="keycloak-adapter-feature-pack" version="${project.version}"/>
     </feature-packs>

diff --git a/distribution/feature-pack-builds/adapter-only/adapter-only-dist/server-provisioning.xml b/distribution/feature-pack-builds/adapter-only/adapter-only-dist/server-provisioning.xml
index bfdf9ae..b9f46bc 100644
--- a/distribution/feature-pack-builds/adapter-only/adapter-only-dist/server-provisioning.xml
+++ b/distribution/feature-pack-builds/adapter-only/adapter-only-dist/server-provisioning.xml
@@ -18,7 +18,7 @@
 <server-provisioning xmlns="urn:wildfly:server-provisioning:1.0" extract-schemas="true" copy-module-artifacts="true">
     <feature-packs>
         <!-- uncomment wildfly-feature-pack to build against wildfly full instead of wildfly web -->
-        <!--<feature-pack groupId="org.wildfly" artifactId="wildfly-feature-pack" version="${wildfly9.version}"/>-->
+        <!--<feature-pack groupId="org.wildfly" artifactId="wildfly-feature-pack" version="${wildfly.version}"/>-->
         
         <feature-pack groupId="org.keycloak" artifactId="keycloak-adapter-feature-pack" version="${project.version}"/>
     </feature-packs>

diff --git a/integration/keycloak-as7-subsystem/pom.xml b/integration/keycloak-as7-subsystem/pom.xml
index 7eb6c22..f1ee2ed 100755
--- a/integration/keycloak-as7-subsystem/pom.xml
+++ b/integration/keycloak-as7-subsystem/pom.xml
@@ -71,25 +71,25 @@
         <dependency>
             <groupId>org.jboss.as</groupId>
             <artifactId>jboss-as-naming</artifactId>
-            <version>7.1.1.Final</version>
+            <version>${jboss.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.as</groupId>
             <artifactId>jboss-as-server</artifactId>
-            <version>7.1.1.Final</version>
+            <version>${jboss.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.as</groupId>
             <artifactId>jboss-as-ee</artifactId>
-            <version>7.1.1.Final</version>
+            <version>${jboss.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.as</groupId>
             <artifactId>jboss-as-web</artifactId>
-            <version>7.1.1.Final</version>
+            <version>${jboss.version}</version>
         </dependency>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
index 9819d9f..917c8ba 100755
--- a/pom.xml
+++ b/pom.xml
@@ -49,11 +49,10 @@
         <xml-apis.version>1.4.01</xml-apis.version>
         <mysql.version>5.1.25</mysql.version>
         <slf4j.version>1.7.7.jbossorg-1</slf4j.version>
-        <jboss.version>7.1.1.Final</jboss.version>
-        <wildfly.version>9.0.0.CR1-SNAPSHOT</wildfly.version>
-        <wildfly.core.version>1.0.0.Beta3</wildfly.core.version>
-        <wildfly9.version>9.0.0.CR1-SNAPSHOT</wildfly9.version> <!-- temporary until we are on WildFly 9 or later -->
+        <wildfly.version>9.0.0.CR1</wildfly.version>
+        <wildfly.core.version>1.0.0.CR1</wildfly.core.version>
         <wildfly.build-tools.version>1.0.0.Alpha8</wildfly.build-tools.version>
+        <jboss.version>7.1.1.Final</jboss.version>
         <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
         <google.zxing.version>2.2</google.zxing.version>
         <google.client.version>1.14.1-beta</google.client.version>
@@ -579,13 +578,13 @@
             <dependency>
                 <groupId>org.wildfly</groupId>
                 <artifactId>wildfly-feature-pack</artifactId>
-                <version>${wildfly9.version}</version>
+                <version>${wildfly.version}</version>
                 <type>zip</type>
             </dependency>
             <dependency>
                 <groupId>org.wildfly</groupId>
                 <artifactId>wildfly-web-feature-pack</artifactId>
-                <version>${wildfly9.version}</version>
+                <version>${wildfly.version}</version>
                 <type>zip</type>
             </dependency>
             <dependency>