You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jd...@apache.org on 2004/09/08 06:05:40 UTC
cvs commit: maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar JarMojo.java
jdcasey 2004/09/07 21:05:40
Modified: maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar
JarMojo.java
Log:
o Fixed misuse of basedir and outputDirectory. Previous version includes test resources in resulting jar.
Revision Changes Path
1.11 +5 -5 maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
Index: JarMojo.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JarMojo.java 7 Jul 2004 07:18:10 -0000 1.10
+++ JarMojo.java 8 Sep 2004 04:05:40 -0000 1.11
@@ -43,14 +43,14 @@
* type="String"
* required="true"
* validator=""
- * expression="#project.build.directory"
+ * expression="#project.build.output"
* description=""
* @parameter
* name="basedir"
* type="String"
* required="true"
* validator=""
- * expression="#project.build.output"
+ * expression="#project.build.directory"
* description=""
*
* @author <a href="michal@codehaus">Michal Maczka</a>
@@ -77,11 +77,11 @@
// ----------------------------------------------------------------------
- File jarFile = new File( new File( outputDirectory ), jarName + ".jar" );
+ File jarFile = new File( basedir, jarName + ".jar" );
Map includes = new LinkedHashMap();
- addDirectory(includes, "**/**", "**/package.html", "", basedir);
+ addDirectory(includes, "**/**", "**/package.html", "", new File( outputDirectory ) );
createJar( jarFile, includes );
}