[maven-ear-plugin] 33/45: [MNG-1071] lookup archiver instead of calling contructor so output will be use with the correct logger. I forgot to modify these files

[hb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to annotated tag maven-ear-plugin-2.0
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git

commit e31344dad3c6514b64778ec6e17edea722da98c7
Author: Emmanuel Venisse <ev...@apache.org>
AuthorDate: Mon Oct 3 21:12:31 2005 +0000

    [MNG-1071] lookup archiver instead of calling contructor so output will be use with the correct logger.
    I forgot to modify these files
    
    git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk/maven-plugins/maven-ear-plugin@293450 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                |  2 +-
 src/main/java/org/apache/maven/plugin/ear/EarMojo.java | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2db5129..3af6fcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
-      <version>2.0-beta-1</version>
+      <version>2.0-beta-3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
diff --git a/src/main/java/org/apache/maven/plugin/ear/EarMojo.java b/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
index caeaebc..e0db307 100644
--- a/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.ear;
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
@@ -86,6 +87,14 @@ public class EarMojo
     private File resourcesDir;
 
     /**
+	 * The Jar archiver.
+	 *
+     * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+     * @required
+     */
+    private JarArchiver jarArchiver;
+
+    /**
      * The maven archiver to use.
      *
      * @parameter
@@ -173,6 +182,7 @@ public class EarMojo
         {
             File earFile = new File( outputDirectory, finalName + ".ear" );
             MavenArchiver archiver = new MavenArchiver();
+            archiver.setArchiver( jarArchiver );
             archiver.setOutputFile( earFile );
 
             // Include custom manifest if necessary

-- 
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.