diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index e5cfe339d..5642d0b0e 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -23,206 +23,210 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
 
-  <id>all</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <dependencySets>
-    <dependencySet>
-      <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-      <excludes>
-        <exclude>junit:junit</exclude>
-        <exclude>org.testng:testng</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-        <directory>src/main/resources</directory>
-        <outputDirectory></outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../core/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>FREEMARKER-LICENSE.txt</include>
-        <include>OGNL-LICENSE.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../plugins/rest/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>XSTREAM-LICENSE.txt</include>
-        <include>XPP3-LICENSE.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../plugins/sitemesh/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>SITEMESH-LICENSE.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/apps</directory>
-      <outputDirectory>apps</outputDirectory>
-      <includes>
-        <include>*.war</include>
-      </includes>
-    </fileSet>
+    <id>all</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+            <scope>runtime</scope>
+            <excludes>
+                <exclude>junit:junit</exclude>
+                <exclude>org.testng:testng</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>src/main/resources</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../core/src/main/resources</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>FREEMARKER-LICENSE.txt</include>
+                <include>OGNL-LICENSE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/rest/src/main/resources</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>XSTREAM-LICENSE.txt</include>
+                <include>XPP3-LICENSE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/sitemesh/src/main/resources</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>SITEMESH-LICENSE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/apps</directory>
+            <outputDirectory>apps</outputDirectory>
+            <includes>
+                <include>*.war</include>
+            </includes>
+        </fileSet>
 
-      <!-- Include the Struts 2 core Javadoc in the assembly -->
-      <fileSet>
-        <directory>../core/target/site</directory>
-        <outputDirectory>docs/struts2-core</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../core/target/apidocs</directory>
-        <outputDirectory>docs/struts2-core-apidocs</outputDirectory>
-      </fileSet>
+        <!-- Include the Struts 2 core Javadoc in the assembly -->
+        <fileSet>
+            <directory>../core/target/site</directory>
+            <outputDirectory>docs/struts2-core</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../core/target/apidocs</directory>
+            <outputDirectory>docs/struts2-core-apidocs</outputDirectory>
+        </fileSet>
 
-      <!-- Include the Confluence docs in the assembly -->
-      <fileSet>
-        <directory>target/docs</directory>
-        <outputDirectory>docs/docs</outputDirectory>
-      </fileSet>
+        <!-- Include the Confluence docs in the assembly -->
+        <fileSet>
+            <directory>target/docs</directory>
+            <outputDirectory>docs/docs</outputDirectory>
+        </fileSet>
 
-      <!-- Plugins -->
-      <!--
-      <fileSet>
-        <directory>../plugins/$plugin/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-$plugin-plugin</outputDirectory>
-      </fileSet>
-      -->
-      <fileSet>
-        <directory>../plugins/bean-validation/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-bean-validation/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/cdi/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-cdi-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/config-browser/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/convention/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/jasperreports/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/javatemplates/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-javatemplates-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/jfreechart/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/json/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-json-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/junit/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-junit-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/plexus/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/rest/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/sitemesh/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/spring/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-spring-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/testng/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-testng-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/tiles/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/velocity/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-velocity-plugin/apidocs</outputDirectory>
-      </fileSet>
+        <!-- Plugins -->
+        <!--
+        <fileSet>
+          <directory>../plugins/$plugin/target/site</directory>
+          <outputDirectory>docs/struts2-plugins/struts2-$plugin-plugin</outputDirectory>
+        </fileSet>
+        -->
+        <fileSet>
+            <directory>../plugins/async/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-async-validation/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/bean-validation/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-bean-validation/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/cdi/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-cdi-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/config-browser/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/convention/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/jasperreports/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/javatemplates/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-javatemplates-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/jfreechart/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/json/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-json-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/junit/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-junit-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/rest/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/sitemesh/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/spring/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-spring-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/testng/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-testng-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/tiles/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/velocity/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-velocity-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/xslt/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-xslt-plugin/apidocs</outputDirectory>
+        </fileSet>
 
-    <!-- Include the source code in the assembly -->
-    <fileSet>
-      <directory>../</directory>
-      <outputDirectory>src/</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-     </fileSet>
-    <fileSet>
-      <directory>../apps</directory>
-      <outputDirectory>src/apps</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../apps/showcase</directory>
-      <outputDirectory>src/apps/showcase</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../apps/rest-showcase</directory>
-      <outputDirectory>src/apps/rest-showcase</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../assembly</directory>
-      <outputDirectory>src/assembly</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../core</directory>
-      <outputDirectory>src/core</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../plugins</directory>
-      <outputDirectory>src/plugins</outputDirectory>
-      <excludes>
-        <exclude>*/target/**</exclude>
-        <exclude>target/**</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
+        <!-- Include the source code in the assembly -->
+        <fileSet>
+            <directory>../</directory>
+            <outputDirectory>src/</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../apps</directory>
+            <outputDirectory>src/apps</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../apps/showcase</directory>
+            <outputDirectory>src/apps/showcase</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../apps/rest-showcase</directory>
+            <outputDirectory>src/apps/rest-showcase</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../assembly</directory>
+            <outputDirectory>src/assembly</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../core</directory>
+            <outputDirectory>src/core</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins</directory>
+            <outputDirectory>src/plugins</outputDirectory>
+            <excludes>
+                <exclude>*/target/**</exclude>
+                <exclude>target/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
 </assembly>
diff --git a/assembly/src/main/assembly/apps.xml b/assembly/src/main/assembly/apps.xml
index 8467ff513..2ef3e44a5 100644
--- a/assembly/src/main/assembly/apps.xml
+++ b/assembly/src/main/assembly/apps.xml
@@ -52,13 +52,6 @@
         <include>OGNL-LICENSE.txt</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../plugins/plexus/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>CLASSWORLDS-LICENSE.txt</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../plugins/rest/src/main/resources</directory>
       <outputDirectory></outputDirectory>
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index a482871d9..922167d76 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -29,12 +29,6 @@
     </formats>
     <fileSets>
 
-        <!-- Include the XWork Javadoc in the assembly -->
-        <fileSet>
-            <directory>../xwork-core/target/apidocs</directory>
-            <outputDirectory>docs/xwork-core/apidocs</outputDirectory>
-        </fileSet>
-
         <!-- Include the website in the assembly -->
         <fileSet>
             <directory>../target/site</directory>
@@ -52,6 +46,10 @@
         </fileSet>
 
         <!-- Plugins -->
+        <fileSet>
+            <directory>../plugins/async/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-async/apidocs</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>../plugins/bean-validation/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-bean-validation/apidocs</outputDirectory>
@@ -68,14 +66,6 @@
             <directory>../plugins/convention/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../plugins/embeddedjsp/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../plugins/gxp/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-gxp-plugin/apidocs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>../plugins/jasperreports/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin/apidocs</outputDirectory>
@@ -96,14 +86,6 @@
             <directory>../plugins/junit/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-junit-plugin/apidocs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../plugins/osgi/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin/apidocs</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../plugins/plexus/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>../plugins/rest/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
@@ -124,6 +106,14 @@
             <directory>../plugins/tiles/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>../plugins/velocity/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-velocity-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/xslt/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-xslt-plugin/apidocs</outputDirectory>
+        </fileSet>
 
     </fileSets>
 </assembly>
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index b03f2d3cc..f9d76f392 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -56,13 +56,6 @@
         <include>OGNL-LICENSE.txt</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../plugins/plexus/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>CLASSWORLDS-LICENSE.txt</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../plugins/rest/src/main/resources</directory>
       <outputDirectory></outputDirectory>
diff --git a/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml
index 77f39f9e9..b70ea518a 100644
--- a/assembly/src/main/assembly/src.xml
+++ b/assembly/src/main/assembly/src.xml
@@ -48,14 +48,6 @@
           <include>src/</include>
         </includes>
       </fileSet>
-        <fileSet>
-          <directory>../api</directory>
-          <outputDirectory>src/api</outputDirectory>
-          <includes>
-            <include>pom.xml</include>
-            <include>src/</include>
-          </includes>
-        </fileSet>
       <fileSet>
         <directory>../apps</directory>
         <outputDirectory>src/apps</outputDirectory>
@@ -107,14 +99,6 @@
           <exclude>*.iws</exclude>
         </excludes>
       </fileSet>
-      <fileSet>
-        <directory>../bundles</directory>
-        <outputDirectory>src/bundles</outputDirectory>
-        <excludes>
-          <exclude>*/target/**</exclude>
-          <exclude>target/**</exclude>
-        </excludes>
-      </fileSet>
 
   </fileSets>
 </assembly>