[maven-ear-plugin] branch master updated: improve archivers use description

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-ear-plugin] branch master updated: improve archivers use description

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 733ab1b  improve archivers use description
733ab1b is described below

commit 733ab1bcac6e88c79445a928fbed8fb47ab4dcd8
Author: Hervé Boutemy <[hidden email]>
AuthorDate: Sat Sep 12 20:18:13 2020 +0200

    improve archivers use description
---
 .../java/org/apache/maven/plugins/ear/EarMojo.java | 23 +++++-----------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
index 4d1841e..6618492 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
@@ -209,19 +209,19 @@ public class EarMojo
     private boolean skinnyWars;
 
     /**
-     * The Jar archiver.
+     * The Jar archiver to create the output archive.
      */
     @Component( role = Archiver.class, hint = "jar" )
     private JarArchiver jarArchiver;
 
     /**
-     * The Zip archiver.
+     * The Zip archiver for Skinny WAR repackaging.
      */
     @Component( role = Archiver.class, hint = "zip" )
     private ZipArchiver zipArchiver;
 
     /**
-     * The Zip Un archiver.
+     * The Zip Un archiver for Skinny WAR repackaging.
      */
     @Component( role = UnArchiver.class, hint = "zip" )
     private ZipUnArchiver zipUnArchiver;
@@ -292,9 +292,8 @@ public class EarMojo
         {
             earFile = getEarFile( outputDirectory, finalName, classifier );
             archiver = new EarMavenArchiver( getModules() );
-            final JarArchiver theJarArchiver = getJarArchiver();
-            getLog().debug( "Jar archiver implementation [" + theJarArchiver.getClass().getName() + "]" );
-            archiver.setArchiver( theJarArchiver );
+            getLog().debug( "Jar archiver implementation [" + jarArchiver.getClass().getName() + "]" );
+            archiver.setArchiver( jarArchiver );
             archiver.setOutputFile( earFile );
 
             archiver.setCreatedBy( "Maven EAR Plugin", "org.apache.maven.plugins", "maven-ear-plugin" );
@@ -701,18 +700,6 @@ public class EarMojo
         unArchiver.extract();
     }
 
-    /**
-     * Returns the {@link JarArchiver} implementation used to package the EAR file.
-     *
-     * By default the archiver is obtained from the Plexus container.
-     *
-     * @return the archiver
-     */
-    protected JarArchiver getJarArchiver()
-    {
-        return jarArchiver;
-    }
-
     private void copyFile( File source, File target )
         throws MavenFilteringException, IOException, MojoExecutionException
     {