Author: dennisl
Date: Thu Sep 11 18:27:55 2014
New Revision: 1624355
URL: http://svn.apache.org/r1624355
Log:
Next version will be 2.10, because we have add both new parameters and new
goals.
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocNoForkReport.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocNoForkReport.java
maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-nofork.apt.vm
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1624355&r1=1624354&r2=1624355&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Thu Sep 11 18:27:55 2014
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.10-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Javadoc Plugin</name>
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=1624355&r1=1624354&r2=1624355&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
Thu Sep 11 18:27:55 2014
@@ -151,7 +151,7 @@ public class JavadocJar
private boolean useDefaultManifestFile;
/**
- * @since 2.9.2
+ * @since 2.10
*/
@Parameter( property = "maven.javadoc.classifier", defaultValue =
"javadoc", required = true )
private String classifier;
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocNoForkReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocNoForkReport.java?rev=1624355&r1=1624354&r2=1624355&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocNoForkReport.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocNoForkReport.java
Thu Sep 11 18:27:55 2014
@@ -31,7 +31,7 @@ import org.apache.maven.plugins.annotati
*
* @author <a href="mailto:mfriedenha...@apache.org";>Mirko Friedenhagen</a>
* @version $Id$
- * @since 2.9.2
+ * @since 2.10
* @see <a
href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/";>Javadoc
Tool</a>
* @see <a
href="http://docs.oracle.com/javase/1.4.2/docs/tooldocs/windows/javadoc.html#options";>Javadoc
Options</a>
*/
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java?rev=1624355&r1=1624354&r2=1624355&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocJar.java
Thu Sep 11 18:27:55 2014
@@ -109,7 +109,7 @@ public class TestJavadocJar
private File testJavadocDirectory;
/**
- * @since 2.9.2
+ * @since 2.10
*/
@Parameter( property = "maven.javadoc.testClassifier", defaultValue =
"test-javadoc", required = true )
private String testClassifier;
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocNoForkReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocNoForkReport.java?rev=1624355&r1=1624354&r2=1624355&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocNoForkReport.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocNoForkReport.java
Thu Sep 11 18:27:55 2014
@@ -32,7 +32,7 @@ import org.apache.maven.plugins.annotati
*
* @author <a href="mailto:mfriedenha...@apache.org";>Mirko Friedenhagen</a>
* @version $Id$
- * @since 2.9.2
+ * @since 2.10
* @see <a
href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/";>Javadoc
Tool</a>
* @see <a
href="http://docs.oracle.com/javase/1.4.2/docs/tooldocs/windows/javadoc.html#options";>Javadoc
Options </a>
*/
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-nofork.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-nofork.apt.vm?rev=1624355&r1=1624354&r2=1624355&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-nofork.apt.vm
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/javadoc-nofork.apt.vm
Thu Sep 11 18:27:55 2014
@@ -40,7 +40,7 @@ Generate Javadoc without duplicate execu
* See {{{https://jira.codehaus.org/browse/MJAVADOC-369}MJAVADOC-369}} as well.
- * As of version 2.9.2 two new reports are defined, <<<javadoc-no-fork>>> and
<<<test-javadoc-no-fork>>>
+ * As of version 2.10 two new reports are defined, <<<javadoc-no-fork>>> and
<<<test-javadoc-no-fork>>>
which will not trigger above phases a second time.
* Configure this in your <<<reporting>>> section as follows:
