You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/09/24 20:24:19 UTC
svn commit: r1525961 - in /maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml
Author: rfscholte
Date: Tue Sep 24 18:24:19 2013
New Revision: 1525961
URL: http://svn.apache.org/r1525961
Log:
[MJAVADOC-376] Fix unittest, narrow visibility and keep classifier required
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java?rev=1525961&r1=1525960&r2=1525961&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java Tue Sep 24 18:24:19 2013
@@ -153,8 +153,8 @@ public class JavadocJar
/**
* @since 2.9.2
*/
- @Parameter( property = "maven.javadoc.classifier", defaultValue = "javadoc" )
- protected String classifier;
+ @Parameter( property = "maven.javadoc.classifier", defaultValue = "javadoc", required = true )
+ private String classifier;
/** {@inheritDoc} */
public void execute()
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml?rev=1525961&r1=1525960&r2=1525961&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml Tue Sep 24 18:24:19 2013
@@ -38,6 +38,7 @@ under the License.
<jarOutputDirectory>${basedir}/target/test/unit/javadocjar-default/target</jarOutputDirectory>
<outputDirectory>${basedir}/target/test/unit/javadocjar-default/target/site/apidocs</outputDirectory>
<finalName>javadocjar-default</finalName>
+ <classifier>javadoc</classifier>
<attach>true</attach>
<breakiterator>false</breakiterator>
<old>false</old>