diff --git a/pom.xml b/pom.xml
index 8bb13acb..21e05336 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,6 @@
         <connection>scm:git:https://github.com/wildfly/boms.git</connection>
         <developerConnection>scm:git:https://github.com/wildfly/boms.git</developerConnection>
         <url>http://github.com/wildfly/boms</url>
-    <tag>9.0.0.CR1-SNAPSHOT</tag>
   </scm>
 
     <developers>
@@ -80,18 +79,18 @@
         <version.org.wildfly.arquillian.container>1.0.0.Alpha5</version.org.wildfly.arquillian.container>
         <version.org.jboss.narayana>5.0.4.Final</version.org.jboss.narayana>
         <version.org.jboss.logging>3.2.1.Final</version.org.jboss.logging>
-        <version.org.jboss.logging.processor>1.2.0.Final</version.org.jboss.logging.processor>
+        <version.org.jboss.logging.processor>2.0.0.Final</version.org.jboss.logging.processor>
         <version.org.jboss.resteasy>3.0.11.Final</version.org.jboss.resteasy>
         <version.org.jboss.security.negotiation>2.3.6.Final</version.org.jboss.security.negotiation>
-        <version.org.jboss.spec.jboss.javaee.7.0>1.0.2.Final</version.org.jboss.spec.jboss.javaee.7.0>
+        <version.org.jboss.spec.jboss.javaee.7.0>1.0.3.Final</version.org.jboss.spec.jboss.javaee.7.0>
         <version.org.jboss.shrinkwrap.resolver>2.0.0</version.org.jboss.shrinkwrap.resolver>
         <version.org.picketlink>2.7.0.Final</version.org.picketlink>
 
         <!-- Version of Hibernate projects -->
-        <version.org.hibernate>4.3.8.Final</version.org.hibernate>
+        <version.org.hibernate>4.3.9.Final</version.org.hibernate>
         <version.org.hibernate-jpamodelgen>${version.org.hibernate}</version.org.hibernate-jpamodelgen>
         <version.org.hibernate.validator>5.1.3.Final</version.org.hibernate.validator>
-        <version.org.hibernate.search>5.1.1.Final</version.org.hibernate.search>
+        <version.org.hibernate.search>5.1.2.Final</version.org.hibernate.search>
 
         <!-- Versions of projects not directly under JBoss umbrella -->
         <version.junit>4.11</version.junit>
@@ -101,7 +100,7 @@
         <!-- Versions of Maven plugins, user must setup them by his/her own -->
         <version.surefire.plugin>2.17</version.surefire.plugin>
         <version.org.wildfly.plugins.maven.plugin>1.0.2.Final</version.org.wildfly.plugins.maven.plugin>
-
+        <version.io.undertow>1.2.4.Final</version.io.undertow>
     </properties>
 
     <dependencyManagement>
@@ -121,12 +120,55 @@
                 <scope>import</scope>
             </dependency>
 
-         <!-- EAP Components -->
+            <dependency>
+                <groupId>io.undertow</groupId>
+                <artifactId>undertow-core</artifactId>
+                <version>${version.io.undertow}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.undertow</groupId>
+                        <artifactId>undertow-build-config</artifactId>
+                    </exclusion>
+                </exclusions>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>io.undertow</groupId>
+                <artifactId>undertow-servlet</artifactId>
+                <version>${version.io.undertow}</version>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.undertow</groupId>
+                        <artifactId>undertow-build-config</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+                        <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.undertow</groupId>
+                <artifactId>undertow-websockets-jsr</artifactId>
+                <version>${version.io.undertow}</version>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.undertow</groupId>
+                        <artifactId>undertow-build-config</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <!-- Hibernate ORM sub-modules -->
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-core</artifactId>
                 <version>${version.org.hibernate}</version>
+                <scope>provided</scope>
                 <!-- this already part of JDK6 -->
                 <exclusions>
                     <exclusion>
@@ -139,6 +181,7 @@
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-entitymanager</artifactId>
                 <version>${version.org.hibernate}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
@@ -149,7 +192,7 @@
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-infinispan</artifactId>
                 <version>${version.org.hibernate}</version>
-                <!-- we use org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec from hibernate-core here -->
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.jboss.javaee</groupId>
@@ -161,46 +204,55 @@
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-c3p0</artifactId>
                 <version>${version.org.hibernate}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-ehcache</artifactId>
                 <version>${version.org.hibernate}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-proxool</artifactId>
                 <version>${version.org.hibernate}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-validator</artifactId>
                 <version>${version.org.hibernate.validator}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-search</artifactId>
                 <version>${version.org.hibernate.search}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-search-analyzers</artifactId>
                 <version>${version.org.hibernate.search}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-search-engine</artifactId>
                 <version>${version.org.hibernate.search}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-search-infinispan</artifactId>
                 <version>${version.org.hibernate.search}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-search-orm</artifactId>
                 <version>${version.org.hibernate.search}</version>
+                <scope>provided</scope>
             </dependency>
             <!-- Tools -->
             <dependency>
@@ -218,11 +270,13 @@
                 <groupId>org.infinispan</groupId>
                 <artifactId>infinispan-core</artifactId>
                 <version>${version.org.infinispan}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.infinispan</groupId>
                 <artifactId>infinispan-client-hotrod</artifactId>
                 <version>${version.org.infinispan}</version>
+                <scope>provided</scope>
             </dependency>
 
             <!--  These dependencies are the jboss-logging tools magic -->
@@ -258,6 +312,7 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>async-http-servlet-3.0</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
@@ -285,21 +340,25 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-jettison-provider</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-jackson-provider</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-jackson2-provider</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-jaxrs</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.jboss.spec.javax.annotation</groupId>
@@ -323,11 +382,13 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-client</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-multipart-provider</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -343,6 +404,7 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-yaml-provider</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.yaml</groupId>
@@ -354,6 +416,7 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-json-p-provider</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.json</groupId>
@@ -369,6 +432,7 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-crypto</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -392,6 +456,7 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>jose-jwt</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle</groupId>
@@ -403,6 +468,7 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-links</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.glassfish</groupId>
@@ -418,11 +484,13 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-jsapi</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-validator-provider-11</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.hibernate</groupId>
@@ -438,6 +506,7 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-servlet-initializer</artifactId>
                 <version>${version.org.jboss.resteasy}</version>
+                <scope>provided</scope>
             </dependency>
 
             <dependency>
@@ -467,26 +536,31 @@
                 <groupId>org.picketlink</groupId>
                 <artifactId>picketlink-api</artifactId>
                 <version>${version.org.picketlink}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.picketlink</groupId>
                 <artifactId>picketlink-impl</artifactId>
                 <version>${version.org.picketlink}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.picketlink</groupId>
                 <artifactId>picketlink-idm-api</artifactId>
                 <version>${version.org.picketlink}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.picketlink</groupId>
                 <artifactId>picketlink-idm-impl</artifactId>
                 <version>${version.org.picketlink}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.picketlink</groupId>
                 <artifactId>picketlink-idm-schema</artifactId>
                 <version>${version.org.picketlink}</version>
+                <scope>provided</scope>
             </dependency>
 
         <!-- Thirdparty dependencies -->