Index: appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF	(revision 52521)
+++ appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF	(working copy)
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
-Build-Jdk: 
-Class-Path: ../modules/javax.servlet.jar ../modules/endorsed/javax.annotation.jar ../modules/javax.ejb.jar ../modules/javax.transaction.jar ../modules/javax.enterprise.deploy.jar ../modules/javax.management.j2ee.jar ../modules/javax.resource.jar ../modules/javax.security.auth.message.jar ../modules/javax.security.jacc.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api-osgi.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/javax.mail.jar ../modules/javax.faces.jar ../modules/javax.servlet.jsp.jar ../modules/javax.servlet.jsp.jstl.jar ../modules/javax.persistence.jar ../modules/javax.jms.jar ../modules/bean-validator.jar ../modules/weld-osgi-bundle.jar ../../mq/lib/jaxm-api.jar ../modules/jersey-core.jar
-GlassFish-ServerExcluded: true
Index: appserver/extras/javaee/manifest-jar/pom.xml
===================================================================
--- appserver/extras/javaee/manifest-jar/pom.xml	(revision 52521)
+++ appserver/extras/javaee/manifest-jar/pom.xml	(working copy)
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -60,7 +60,10 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+	                <manifestEntries>
+	                    <Class-Path>../modules/javax.servlet.jar ../modules/endorsed/javax.annotation.jar ../modules/javax.ejb.jar ../modules/javax.transaction.jar ../modules/javax.enterprise.deploy.jar ../modules/javax.management.j2ee.jar ../modules/javax.resource.jar ../modules/javax.security.auth.message.jar ../modules/javax.security.jacc.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/endorsed/jaxb-api-osgi.jar ../modules/endorsed/webservices-api-osgi.jar ../modules/javax.mail.jar ../modules/javax.faces.jar ../modules/javax.servlet.jsp.jar ../modules/javax.servlet.jsp.jstl.jar ../modules/javax.persistence.jar ../modules/javax.jms.jar ../modules/bean-validator.jar ../modules/weld-osgi-bundle.jar ../../mq/lib/jaxm-api.jar ../modules/jersey-core.jar</Class-Path>
+	                    <GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
+	                </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
Index: appserver/web/weld-integration-fragment/pom.xml
===================================================================
--- appserver/web/weld-integration-fragment/pom.xml	(revision 52521)
+++ appserver/web/weld-integration-fragment/pom.xml	(working copy)
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -78,14 +78,7 @@
 <!-- The export of javassist.util.proxy is done to ensure that the weld-generated proxy has access to the ProxyFactory class
 in that package. This "partial" export of the javassist package would not cause the problem described in IT 12368, because
 javassist has fixed the issue in JASSIST-104, and as part of WELD-570, the new javassist version is integrated in Weld 1.1.Beta2 -->
-                            <Export-Package>
-org.jboss.weld.proxy.util,
-org.jboss.weld.bean.proxy.util,
-org.jboss.weld.context.http,
-org.jboss.weld.context.cache,
-org.jboss.weld.bean.builtin.ee,
-javassist.util.proxy
-                            </Export-Package>
+                            <Export-Package>org.jboss.weld.proxy.util, org.jboss.weld.bean.proxy.util, org.jboss.weld.context.http, org.jboss.weld.context.cache, org.jboss.weld.bean.builtin.ee, javassist.util.proxy</Export-Package>
                             <Bundle-Description>${project.description}</Bundle-Description> 
                         </manifestEntries>
                     </archive>
Index: pom.xml
===================================================================
--- pom.xml	(revision 52521)
+++ pom.xml	(working copy)
@@ -568,14 +568,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-		 <version>2.3.2</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-archiver</artifactId>
-                        <version>2.4</version>
-                   </dependency>
-                </dependencies>
+		 <version>2.4</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>