Index: src/assembly/bin.xml
===================================================================
--- src/assembly/bin.xml	(revision 151330)
+++ src/assembly/bin.xml	(working copy)
@@ -18,6 +18,7 @@
 <assembly>
     <includeBaseDirectory>true</includeBaseDirectory>
     <baseDirectory>wso2carbon-core-5.0.0-SNAPSHOT</baseDirectory>
+    <id>carbon</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -111,13 +112,13 @@
         <dependencySet>
             <outputDirectory>lib/endorsed</outputDirectory>
             <includes>
+                <include>org.apache.geronimo.specs.wso2:geronimo-stax-api_1.0_spec:jar</include>
                 <include>xerces.wso2:xercesImpl:jar</include>
                 <include>xalan.wso2:xalan:jar</include>
                 <include>xml-apis.wso2:xml-apis:jar</include>
                 <include>org.apache.geronimo.specs:geronimo-jaxws_2.2_spec:jar</include>
                 <include>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec:jar</include>
                 <include>org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar</include>
-		<include>org.apache.geronimo.specs.wso2:geronimo-stax-api_1.0_spec:jar</include>
             </includes>
         </dependencySet>
         <dependencySet>
Index: pom.xml
===================================================================
--- pom.xml	(revision 151652)
+++ pom.xml	(working copy)
@@ -35,6 +35,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.specs.wso2</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1.wso2v2</version>
+        </dependency>
+        <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.bootstrap</artifactId>
             <version>${project.parent.version}</version>
@@ -120,11 +125,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxws_2.2_spec</artifactId>
         </dependency>
-        <dependency>
-	    <groupId>org.apache.geronimo.specs.wso2</groupId>
-	    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-	    <version>1.0.1.wso2v2</version>
-        </dependency>
+
     </dependencies>
     <build>
         <plugins>
@@ -313,7 +314,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <version>2.4</version>
                 <executions>
                     <execution>
                         <id>2-dist</id>
@@ -328,6 +329,7 @@
                             <descriptors>
                                 <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
                             </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
                         </configuration>
                     </execution>
                 </executions>