svn commit: r1720979 - in /maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar: AbstractJarMojo.java TestJarMojo.java

[kh...@apache.org]

Author: khmarbaise
Date: Sat Dec 19 22:07:53 2015
New Revision: 1720979

URL: http://svn.apache.org/viewvc?rev=1720979&view=rev
Log:
[MJAR-199] Option "classifier" to goal test-jar
Added parameter for classifier to the test-jar goal.

Modified:
    maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
    maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java

Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java?rev=1720979&r1=1720978&r2=1720979&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java Sat Dec 19 22:07:53 2015
@@ -279,7 +279,7 @@ public abstract class AbstractJarMojo
     /**
      * @return true in case where the classifier is not {@code null} and contains something else than white spaces.
      */
-    private boolean hasClassifier()
+    protected boolean hasClassifier()
     {
         boolean result = false;
         if ( getClassifier() != null && getClassifier().trim().length() > 0 )

Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java?rev=1720979&r1=1720978&r2=1720979&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java Sat Dec 19 22:07:53 2015
@@ -32,15 +32,16 @@ import org.apache.maven.plugins.annotati
  * @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */
-@Mojo( name = "test-jar", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true,
-       requiresDependencyResolution = ResolutionScope.TEST )
+// CHECKSTYLE_OFF: LineLength
+@Mojo( name = "test-jar", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST )
+// CHECKSTYLE_ON: LineLength
 public class TestJarMojo
     extends AbstractJarMojo
 {
 
     /**
-     * Set this to <code>true</code> to bypass unit tests entirely.
-     * Its use is <b>NOT RECOMMENDED</b>, but quite convenient on occasion.
+     * Set this to <code>true</code> to bypass unit tests entirely. Its use is <b>NOT RECOMMENDED</b>, but quite
+     * convenient on occasion.
      */
     @Parameter( property = "maven.test.skip" )
     private boolean skip;
@@ -51,9 +52,15 @@ public class TestJarMojo
     @Parameter( defaultValue = "${project.build.testOutputDirectory}", required = true )
     private File testClassesDirectory;
 
+    /**
+     * Classifier to used for {@code test-jar}.
+     */
+    @Parameter( property = "maven.jar.testClassifier", defaultValue = "tests" )
+    private String classifier;
+
     protected String getClassifier()
     {
-        return "tests";
+        return classifier;
     }
 
     /**