Index: src/it/manifest-classpath/pom.xml
===================================================================
--- src/it/manifest-classpath/pom.xml	(revision 1233851)
+++ src/it/manifest-classpath/pom.xml	(working copy)
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.ejb.mc</groupId>
-  <artifactId>test</artifactId>
-  <version>1.0</version>
-  <packaging>ejb</packaging>
-
-  <name>Integration Test</name> 
-  <description>
-    Test the generation of the Class-Path attribute for the MANIFEST.MF (MEJB-46).
-  </description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-ejb-plugin</artifactId>
-        <version>@project.version@</version>
-        <configuration>
-          <ejbVersion>3.0</ejbVersion>
-          <archive>
-            <manifest>
-              <addClasspath>true</addClasspath>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
Index: src/it/manifest-classpath/verify.bsh
===================================================================
--- src/it/manifest-classpath/verify.bsh	(revision 1233851)
+++ src/it/manifest-classpath/verify.bsh	(working copy)
@@ -1,22 +0,0 @@
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.regex.*;
-
-File jarFile = new File( basedir, "target/test-1.0.jar" );
-System.out.println( "Checking for existence of " + jarFile );
-if ( !jarFile.isFile() )
-{
-    throw new FileNotFoundException( "Missing " + jarFile );
-}
-
-JarFile jar = new JarFile( jarFile );
-
-Manifest mf = jar.getManifest();
-String classpath = mf.getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
-if ( classpath == null || classpath.indexOf( "junit-3.8.2.jar" ) < 0 )
-{
-    throw new IllegalStateException( "Bad Class-Path " + classpath );
-}
-
-jar.close();
Index: src/it/manifest-content/verify.bsh
===================================================================
--- src/it/manifest-content/verify.bsh	(revision 1233851)
+++ src/it/manifest-content/verify.bsh	(working copy)
@@ -12,8 +12,14 @@
 
 JarFile jar = new JarFile( jarFile );
 
-Manifest mf = jar.getManifest();
-String classpath = mf.getMainAttributes().getValue( Attributes.Name.CLASS_PATH );
+Attributes manifest = jar.getManifest().getMainAttributes();
+
+if ( !manifest.getValue( new Attributes.Name( "Created-By" ) ).startsWith( "Apache Maven" ) )
+{
+    throw new IllegalStateException( "Created-By not equals Apache Maven" );
+}
+
+String classpath = manifest.getValue( Attributes.Name.CLASS_PATH );
 if ( classpath == null || classpath.indexOf( "junit-3.8.2.jar" ) < 0 )
 {
     throw new IllegalStateException( "Bad Class-Path " + classpath );
Index: src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
===================================================================
--- src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java	(revision 1233851)
+++ src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java	(working copy)
@@ -324,7 +324,7 @@
             }
 
             // create archive
-            archiver.createArchive( project, archive );
+            archiver.createArchive( session, project, archive );
         }
         catch ( ArchiverException e )
         {
@@ -393,7 +393,7 @@
                 clientArchiver.getArchiver().addDirectory( outputDirectory, includes, excludes );
 
                 // create archive
-                clientArchiver.createArchive( project, archive );
+                clientArchiver.createArchive( session, project, archive );
 
             }
             catch ( ArchiverException e )
Index: pom.xml
===================================================================
--- pom.xml	(revision 1233851)
+++ pom.xml	(working copy)
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
-      <version>2.4.1</version>
+      <version>2.5-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
@@ -89,12 +89,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>2.0.5</version>
+      <version>3.0</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>1.0</version>
+      <version>2.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>