Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Fixed misuse of basedir and outputDirectory. Previous version includes test resources in resulting jar. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163050 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2004-09-08 04:05:40 +00:00
parent 891cd440da
commit add8ebca37
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
View File

@ -43,14 +43,14 @@ import java.util.Map;
* type="String" * type="String"
* required="true" * required="true"
* validator="" * validator=""
* expression="#project.build.directory" * expression="#project.build.output"
* description="" * description=""
* @parameter * @parameter
* name="basedir" * name="basedir"
* type="String" * type="String"
* required="true" * required="true"
* validator="" * validator=""
* expression="#project.build.output" * expression="#project.build.directory"
* description="" * description=""
* *
* @author <a href="michal@codehaus">Michal Maczka</a> * @author <a href="michal@codehaus">Michal Maczka</a>
@ -77,11 +77,11 @@ public class JarMojo
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
File jarFile = new File( new File( outputDirectory ), jarName + ".jar" ); File jarFile = new File( basedir, jarName + ".jar" );
Map includes = new LinkedHashMap(); Map includes = new LinkedHashMap();
addDirectory(includes, "**/**", "**/package.html", "", basedir); addDirectory(includes, "**/**", "**/package.html", "", new File( outputDirectory ) );
createJar( jarFile, includes ); createJar( jarFile, includes );
} }