You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/10/19 17:02:26 UTC
svn commit: r1533772 - in /maven/plugins/trunk/maven-javadoc-plugin: ./
src/test/java/org/apache/maven/plugin/javadoc/
src/test/resources/unit/aggregate-resources-test/
src/test/resources/unit/aggregate-test/
src/test/resources/unit/custom-configuratio...
Author: hboutemy
Date: Sat Oct 19 15:02:25 2013
New Revision: 1533772
URL: http://svn.apache.org/r1533772
Log:
o removed javadoc-options-javadoc-resources.xml in root directory added by inadvertance
o fixed unit-test configurations to avoid creation of this file in the root directory
Removed:
maven/plugins/trunk/maven-javadoc-plugin/javadoc-options-javadoc-resources.xml
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/helpfile-test/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/newline-test/newline-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/pom-test/pom-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-test/resources-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/stylesheetfile-test/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tag-test/tag-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java Sat Oct 19 15:02:25 2013
@@ -652,7 +652,7 @@ public class JavadocReportTest
JavadocReport mojo = (JavadocReport) lookupMojo( "javadoc", testPom );
mojo.execute();
- assertFalse( new File( getBasedir(), "target/test/unit/pom-test" ).exists() );
+ assertFalse( new File( getBasedir(), "target/test/unit/pom-test/target/site" ).exists() );
}
/**
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -37,6 +37,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.AggregateResourcesTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/aggregate-resources-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/aggregate-resources-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API</windowtitle>
<reactorProjects>
<project implementation="org.apache.maven.plugin.javadoc.stubs.AggregateResourcesProject1TestMavenProjectStub"/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -37,6 +37,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.AggregateTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/aggregate-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/aggregate-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
<show>protected</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.CustomConfigurationMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/custom-configuration/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/custom-configuration/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>true</old>
<show>private</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.DocfilesTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/docfiles-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/docfiles-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
<show>protected</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.DocfilesWithJavaTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/docfiles-with-java-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/docfiles-with-java-test/target/javadoc-bundle-options</javadocOptionsDir>
<javadocDirectory>${basedir}/src/test/resources/unit/docfiles-with-java-test/src/main</javadocDirectory>
<breakiterator>false</breakiterator>
<old>false</old>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.DocletPathTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/doclet-path-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/doclet-path-test/target/javadoc-bundle-options</javadocOptionsDir>
<doclet>UmlGraph</doclet>
<docletArtifacts>
<docletArtifact>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.DocletTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/doclet-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/doclet-test/target/javadoc-bundle-options</javadocOptionsDir>
<doclet>UmlGraph</doclet>
<docletArtifact>
<groupId>umlgraph</groupId>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.SubpackagesTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/file-include-exclude-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/file-include-exclude-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
<show>protected</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.HeaderFooterTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/header-footer-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/header-footer-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
<groups/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/helpfile-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/helpfile-test/pom.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/helpfile-test/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/helpfile-test/pom.xml Sat Oct 19 15:02:25 2013
@@ -37,6 +37,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.HelpFileMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/helpfile-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/helpfile-test/target/javadoc-bundle-options</javadocOptionsDir>
<javadocDirectory>${basedir}/src/test/resources/unit/helpfile-test/src/main/javadoc</javadocDirectory>
<breakiterator>false</breakiterator>
<old>false</old>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.DefaultConfigurationMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/javaHome-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/javaHome-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
<show>protected</show>
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=1533772&r1=1533771&r2=1533772&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 Sat Oct 19 15:02:25 2013
@@ -37,6 +37,7 @@ under the License.
<localRepository>${localRepository}</localRepository>
<jarOutputDirectory>${basedir}/target/test/unit/javadocjar-default/target</jarOutputDirectory>
<outputDirectory>${basedir}/target/test/unit/javadocjar-default/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/javadocjar-default/target/javadoc-bundle-options</javadocOptionsDir>
<finalName>javadocjar-default</finalName>
<classifier>javadoc</classifier>
<attach>true</attach>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -38,6 +38,7 @@ under the License.
<destDir>${basedir}/target/test/unit/javadocjar-invalid-destdir/target/invalid</destDir>
<jarOutputDirectory>${basedir}/target/test/unit/javadocjar-invalid-destdir/target</jarOutputDirectory>
<outputDirectory>${basedir}/target/test/unit/javadocjar-invalid-destdir/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/javadocjar-invalid-destdir/target/javadoc-bundle-options</javadocOptionsDir>
<finalName>javadocjar-invalid-destdir</finalName>
<attach>true</attach>
<breakiterator>false</breakiterator>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.Jdk5TestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/jdk5-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/jdk5-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
<tags/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.Jdk6TestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/jdk6-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/jdk6-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
<groups/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/newline-test/newline-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/newline-test/newline-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/newline-test/newline-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/newline-test/newline-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.NewlineTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/newline-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/newline-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
<groups/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/pom-test/pom-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/pom-test/pom-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/pom-test/pom-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/pom-test/pom-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -42,6 +42,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.PomMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/pom-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/pom-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
<groups/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/quotedpath%27test/quotedpath-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.QuotedPathMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/quotedpath'test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/quotedpath'test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
<show>protected</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-test/resources-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-test/resources-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-test/resources-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-test/resources-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.ResourcesTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/resources-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/resources-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin resources 1.0-SNAPSHOT API</windowtitle>
<javadocDirectory>${basedir}/src/test/resources/unit/resources-test/src/main/javadoc</javadocDirectory>
<show>protected</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.ResourcesWithExcludesTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/resources-with-excludes-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/resources-with-excludes-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin resources 1.0-SNAPSHOT API</windowtitle>
<javadocDirectory>${basedir}/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc</javadocDirectory>
<show>protected</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/stylesheetfile-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/stylesheetfile-test/pom.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/stylesheetfile-test/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/stylesheetfile-test/pom.xml Sat Oct 19 15:02:25 2013
@@ -37,6 +37,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.StylesheetFileMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/stylesheetfile-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/stylesheetfile-test/target/javadoc-bundle-options</javadocOptionsDir>
<javadocDirectory>${basedir}/src/test/resources/unit/stylesheetfile-test/src/main/javadoc</javadocDirectory>
<breakiterator>false</breakiterator>
<old>false</old>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.SubpackagesTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/subpackages-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/subpackages-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
<show>protected</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tag-test/tag-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tag-test/tag-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tag-test/tag-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tag-test/tag-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.TagTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/tag-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/tag-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin tag 1.0-SNAPSHOT API</windowtitle>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.TagletTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/taglet-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/taglet-test/target/javadoc-bundle-options</javadocOptionsDir>
<taglet>org.tullmann.taglets.ToDo</taglet>
<tagletArtifact>
<groupId>org.tullmann</groupId>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.TagletArtifactsMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/tagletArtifacts-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/tagletArtifacts-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
<show>protected</show>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -42,6 +42,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.TestJavadocMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/test-javadoc-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/test-javadoc-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Test Javadoc Plugin aggregate resources 1.0-SNAPSHOT API</windowtitle>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.StandardDocletConflictOptionsTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
<groups/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
<tags/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
<tags/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
<tags/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
<tags/>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml?rev=1533772&r1=1533771&r2=1533772&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml Sat Oct 19 15:02:25 2013
@@ -36,6 +36,7 @@ under the License.
<project implementation="org.apache.maven.plugin.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
<localRepository>${localRepository}</localRepository>
<outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
<tags/>