You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2005/10/03 11:48:38 UTC
svn commit: r293285 - in /maven/components/trunk:
maven-archiver/src/main/java/org/apache/maven/archiver/
maven-plugins/maven-jar-plugin/
maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/
Author: evenisse
Date: Mon Oct 3 02:48:32 2005
New Revision: 293285
URL: http://svn.apache.org/viewcvs?rev=293285&view=rev
Log:
[MNG-1071] lookup JarArchiver instead of calling contructor so output will be use with the correct logger.
Modified:
maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
maven/components/trunk/maven-plugins/maven-jar-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
Modified: maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=293285&r1=293284&r2=293285&view=diff
==============================================================================
--- maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java (original)
+++ maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java Mon Oct 3 02:48:32 2005
@@ -42,7 +42,7 @@
*/
public class MavenArchiver
{
- private JarArchiver archiver = new JarArchiver();
+ private JarArchiver archiver;
private File archiveFile;
Modified: maven/components/trunk/maven-plugins/maven-jar-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/pom.xml?rev=293285&r1=293284&r2=293285&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-jar-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-jar-plugin/pom.xml Mon Oct 3 02:48:32 2005
@@ -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>
</dependencies>
</project>
Modified: maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java?rev=293285&r1=293284&r2=293285&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java Mon Oct 3 02:48:32 2005
@@ -21,6 +21,7 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
import java.io.File;
@@ -58,6 +59,14 @@
private String finalName;
/**
+ * The Jar archiver.
+ *
+ * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+ * @required
+ */
+ private JarArchiver jarArchiver;
+
+ /**
* The maven project.
*
* @parameter expression="${project}"
@@ -113,6 +122,8 @@
File jarFile = new File( basedir, finalName + classifier + ".jar" );
MavenArchiver archiver = new MavenArchiver();
+
+ archiver.setArchiver( jarArchiver );
archiver.setOutputFile( jarFile );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org