svn commit: r1235632 - in /maven/plugins/trunk/maven-ear-plugin: pom.xml src/main/java/org/apache/maven/plugin/ear/EarMojo.java src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java

[sn...@apache.org]

Author: snicoll
Date: Wed Jan 25 05:33:29 2012
New Revision: 1235632

URL: http://svn.apache.org/viewvc?rev=1235632&view=rev
Log:
MEAR-145: Add Maven version used to Created-By entry in manifest (Submitted by Anders Hammar).

Modified:
    maven/plugins/trunk/maven-ear-plugin/pom.xml
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java

Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1235632&r1=1235631&r2=1235632&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Jan 25 05:33:29 2012
@@ -53,7 +53,7 @@ under the License.
   </issueManagement>
 
   <properties>
-    <mavenArchiverVersion>2.4.2</mavenArchiverVersion>
+    <mavenArchiverVersion>2.5-SNAPSHOT</mavenArchiverVersion>
     <mavenFilteringVersion>1.0-beta-2</mavenFilteringVersion>
     <mavenVersion>2.0.6</mavenVersion>
   </properties>
@@ -87,7 +87,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>1.0</version>
+      <version>2.1</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -97,7 +97,7 @@ 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.apache.maven.shared</groupId>

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1235632&r1=1235631&r2=1235632&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Wed Jan 25 05:33:29 2012
@@ -444,7 +444,7 @@ public class EarMojo
                 "Including " + Arrays.asList( getPackagingIncludes() ) + " in the generated EAR." );
 
             archiver.getArchiver().addDirectory( getWorkDirectory(), getPackagingIncludes(), getPackagingExcludes() );
-            archiver.createArchive( getProject(), archive );
+            archiver.createArchive( session, getProject(), archive );
 
             if ( classifier != null )
             {
@@ -813,4 +813,4 @@ public class EarMojo
             throw new MojoFailureException( e.getMessage() );
         }
     }
-}
\ No newline at end of file
+}

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java?rev=1235632&r1=1235631&r2=1235632&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/EarMavenArchiver.java Wed Jan 25 05:33:29 2012
@@ -25,6 +25,7 @@ import java.util.Set;
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.ear.EarModule;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.archiver.jar.Manifest;
@@ -56,10 +57,17 @@ public class EarMavenArchiver
         this.earModules = earModules;
     }
 
+    /** @deprecated */
     public Manifest getManifest( MavenProject project, MavenArchiveConfiguration config )
+                    throws ManifestException, DependencyResolutionRequiredException
+    {
+        return this.getManifest( null, project, config );
+    }
+
+    public Manifest getManifest( MavenSession session, MavenProject project, MavenArchiveConfiguration config )
         throws ManifestException, DependencyResolutionRequiredException
     {
-        final Manifest manifest = super.getManifest( project, config );
+        final Manifest manifest = super.getManifest( session, project, config );
         if ( config.getManifest().isAddClasspath() )
         {
             String earManifestClassPathEntry = generateClassPathEntry( config.getManifest().getClasspathPrefix() );