You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/02/03 14:59:02 UTC
svn commit: r740305 - in /maven/plugins/trunk/maven-jar-plugin/src:
main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
main/java/org/apache/maven/plugin/jar/JarMojo.java
main/java/org/apache/maven/plugin/jar/TestJarMojo.java site/apt/usage.apt
Author: bentmann
Date: Tue Feb 3 13:59:02 2009
New Revision: 740305
URL: http://svn.apache.org/viewvc?rev=740305&view=rev
Log:
o Clarified documentation
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java?rev=740305&r1=740304&r2=740305&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java Tue Feb 3 13:59:02 2009
@@ -44,14 +44,16 @@
private static final String[] DEFAULT_INCLUDES = new String[] { "**/**" };
/**
- * List of files to include. Specified as fileset patterns.
+ * List of files to include. Specified as fileset patterns which are relative to the input directory whose contents
+ * is being packaged into the JAR.
*
* @parameter
*/
private String[] includes;
/**
- * List of files to exclude. Specified as fileset patterns.
+ * List of files to exclude. Specified as fileset patterns which are relative to the input directory whose contents
+ * is being packaged into the JAR.
*
* @parameter
*/
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java?rev=740305&r1=740304&r2=740305&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java Tue Feb 3 13:59:02 2009
@@ -35,7 +35,7 @@
extends AbstractJarMojo
{
/**
- * Directory containing the classes.
+ * Directory containing the classes and resource files that should be packaged into the JAR.
*
* @parameter expression="${project.build.outputDirectory}"
* @required
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java?rev=740305&r1=740304&r2=740305&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java Tue Feb 3 13:59:02 2009
@@ -45,7 +45,7 @@
private boolean skip;
/**
- * Directory containing the test classes.
+ * Directory containing the test classes and resource files that should be packaged into the JAR.
*
* @parameter expression="${project.build.testOutputDirectory}"
* @required
Modified: maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt?rev=740305&r1=740304&r2=740305&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/site/apt/usage.apt Tue Feb 3 13:59:02 2009
@@ -136,6 +136,9 @@
</project>
+-----------------+
+ Note that the patterns need to be relative to the path specified for the plugin's
+ <<<classesDirectory>>> parameter.
+
* How to create an additional attached jar artifact from the project
Specify a list of fileset patterns to be included or excluded by adding