diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index ca8ad0d5..a24abfa8 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -97,6 +97,11 @@
             <version>2.1.3</version>
             <scope>test</scope>
         </dependency>
+        <!-- JEE dependencies -->
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+        </dependency>
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.easymock</groupId>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index 6ade055e..fc21931b 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -88,8 +88,7 @@
             <artifactId>xercesImpl</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- O/X Mapping dependencies -->
-        <!-- Castor -->
+        <!-- O/X Mapping dependencies --><!-- Castor -->
         <dependency>
             <groupId>org.codehaus.castor</groupId>
             <artifactId>castor</artifactId>
@@ -172,6 +171,18 @@
             <version>20060615</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>isorelax</groupId>
+            <artifactId>isorelax</artifactId>
+            <version>20030108</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>relaxngDatatype</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+            <version>20020414</version>
+            <scope>test</scope>
+        </dependency>
         <!-- XMLBeans -->
         <dependency>
             <groupId>xmlbeans</groupId>
diff --git a/src/assembly/all.xml b/src/assembly/all.xml
index b36b1d9a..900f3c98 100644
--- a/src/assembly/all.xml
+++ b/src/assembly/all.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly>
-	<id>all</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
+    <id>all</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
     <moduleSets>
         <moduleSet>
             <includes>
@@ -16,6 +16,7 @@
                 <include>org.springframework.ws:spring-ws-security</include>
             </includes>
             <binaries>
+                <includeDependencies>false</includeDependencies>
                 <unpack>true</unpack>
             </binaries>
         </moduleSet>
diff --git a/xml/pom.xml b/xml/pom.xml
index 18d7594d..204ccbc4 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>