Author: dennisl
Date: Wed Jan 25 20:44:15 2012
New Revision: 1235931
URL: http://svn.apache.org/viewvc?rev=1235931&view=rev
Log:
[MEJB-56] Add Maven version used to Created-By entry in manifest
Submitted by: Anders Hammar
Reviewed by: Dennis Lundberg
Added:
maven/plugins/trunk/maven-ejb-plugin/src/it/manifest-content/
- copied from r1235537,
maven/plugins/trunk/maven-ejb-plugin/src/it/manifest-classpath/
Removed:
maven/plugins/trunk/maven-ejb-plugin/src/it/manifest-classpath/
Modified:
maven/plugins/trunk/maven-ejb-plugin/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=1235931&r1=1235930&r2=1235931&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Wed Jan 25 20:44:15 2012
@@ -73,7 +73,7 @@ under the License.
<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 @@ under the License.
<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>
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=1235931&r1=1235930&r2=1235931&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Wed Jan 25 20:44:15 2012
@@ -324,7 +324,7 @@ public class EjbMojo
}
// create archive
- archiver.createArchive( project, archive );
+ archiver.createArchive( session, project, archive );
}
catch ( ArchiverException e )
{
@@ -393,7 +393,7 @@ public class EjbMojo
clientArchiver.getArchiver().addDirectory( outputDirectory,
includes, excludes );
// create archive
- clientArchiver.createArchive( project, archive );
+ clientArchiver.createArchive( session, project, archive );
}
catch ( ArchiverException e )
