Index: aspects/pom.xml
===================================================================
--- aspects/pom.xml	(revision 108415)
+++ aspects/pom.xml	(working copy)
@@ -65,6 +65,12 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-as-int</artifactId>
+      <exclusions>
+        <exclusion>
+           <groupId>org.jboss.system</groupId>
+           <artifactId>system-jmx</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.cluster</groupId>
Index: ejb3/pom.xml
===================================================================
--- ejb3/pom.xml	(revision 108415)
+++ ejb3/pom.xml	(working copy)
@@ -42,6 +42,11 @@
   
   <dependencies>
     <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>apache-xerces</groupId>
       <artifactId>xml-apis</artifactId>
     </dependency>
@@ -122,11 +127,27 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-as-int</artifactId>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.system</groupId>
+            <artifactId>system-jmx</artifactId>
+          </exclusion>
+        </exclusions>
     </dependency>
     
     <dependency>
       <groupId>org.jboss.ejb3.vfs</groupId>
       <artifactId>jboss-ejb3-vfs-impl-vfs2</artifactId>
+      <exclusions>
+         <exclusion>
+           <groupId>org.jboss.metadata</groupId>
+           <artifactId>jboss-metadata-common</artifactId>
+         </exclusion>
+         <exclusion>
+           <groupId>sun-jaxb</groupId>
+           <artifactId>jaxb-api</artifactId>
+         </exclusion>
+       </exclusions>
     </dependency>
 
     <dependency>
@@ -148,7 +169,7 @@
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-connector</artifactId>
-    </dependency>
+          </dependency>
     
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
Index: spring-int/pom.xml
===================================================================
--- spring-int/pom.xml	(revision 108415)
+++ spring-int/pom.xml	(working copy)
@@ -128,6 +128,10 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.cache</groupId>
+      <artifactId>jbosscache-core</artifactId>
+    </dependency>
   </dependencies>
   
-</project>
\ No newline at end of file
+</project>
Index: thirdparty/pom.xml
===================================================================
--- thirdparty/pom.xml	(revision 108415)
+++ thirdparty/pom.xml	(working copy)
@@ -1522,6 +1522,10 @@
       <!--JBAS-6798 May be removed after jboss-ejb3-as-int is 1.1.5-->
       <exclusions>
         <exclusion>
+           <groupId>org.jboss.system</groupId>
+           <artifactId>system-jmx</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.jboss.ejb3</groupId>
           <artifactId>jboss-ejb3-proxy</artifactId>
         </exclusion>
Index: webservices/pom.xml
===================================================================
--- webservices/pom.xml	(revision 108415)
+++ webservices/pom.xml	(working copy)
@@ -24,6 +24,10 @@
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-spi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.ws</groupId>
+      <artifactId>jbossws-framework</artifactId>
+    </dependency>
     <!-- jboss provided dependencies -->
     <dependency>
       <groupId>javax.xml.ws</groupId>
@@ -71,11 +75,17 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-as-int</artifactId>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.system</groupId>
+            <artifactId>system-jmx</artifactId>
+          </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-common</artifactId>
-      <version>${version.org.jboss.ejb3.common.client}</version>
+      <version>1.0.3</version>
     </dependency>
     <!-- transitive dependencies -->
     <dependency>