diff --git a/pom.xml b/pom.xml index 44fee50c..0c404613 100644 --- a/pom.xml +++ b/pom.xml @@ -210,6 +210,13 @@ under the License. maven-reporting-api 4.0.0-M8 + + + org.apache.maven.reporting + maven-reporting-impl + 4.0.0-M11 + provided + org.apache.maven maven-archiver diff --git a/src/it/projects/MJAVADOC-320/verify.groovy b/src/it/projects/MJAVADOC-320/verify.groovy index d9375a34..7df00534 100644 --- a/src/it/projects/MJAVADOC-320/verify.groovy +++ b/src/it/projects/MJAVADOC-320/verify.groovy @@ -1,48 +1,48 @@ - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -File target = new File( basedir, "module2/target" ); -assert target.exists() -assert target.isDirectory() - -File apidocs = new File( target, "apidocs" ); -assert apidocs.exists() -assert apidocs.isDirectory() - -// module3 must be included -File module3File = new File( apidocs, "org/apache/maven/plugin/javadoc/it/Module3Class.html" ); -assert module3File.exists() -assert module3File.isFile() - -// el-api must be included -File elApiFile = new File( apidocs, "javax/el/ValueExpression.html" ); -assert elApiFile.exists() -assert elApiFile.isFile() - -// module1 must NOT be included -File module1File = new File( apidocs, "org/apache/maven/plugin/javadoc/it/Module1Class.html" ); -assert !module1File.exists() -assert !module1File.isFile() - -// servlet-api must NOT be included -File servletSpecFile = new File( apidocs, "javax/servlet/ServletContext.html" ); -assert !servletSpecFile.exists() -assert !servletSpecFile.isFile() - + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +File target = new File( basedir, "module2/target" ); +assert target.exists() +assert target.isDirectory() + +File apidocs = new File( target, "site/apidocs" ); +assert apidocs.exists() +assert apidocs.isDirectory() + +// module3 must be included +File module3File = new File( apidocs, "org/apache/maven/plugin/javadoc/it/Module3Class.html" ); +assert module3File.exists() +assert module3File.isFile() + +// el-api must be included +File elApiFile = new File( apidocs, "javax/el/ValueExpression.html" ); +assert elApiFile.exists() +assert elApiFile.isFile() + +// module1 must NOT be included +File module1File = new File( apidocs, "org/apache/maven/plugin/javadoc/it/Module1Class.html" ); +assert !module1File.exists() +assert !module1File.isFile() + +// servlet-api must NOT be included +File servletSpecFile = new File( apidocs, "javax/servlet/ServletContext.html" ); +assert !servletSpecFile.exists() +assert !servletSpecFile.isFile() + diff --git a/src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy b/src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy index 3a870ed3..4151588d 100644 --- a/src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy +++ b/src/it/projects/MJAVADOC-506_excl-module-info/verify.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ - + def javaVersion = System.getProperty( "java.specification.version" ) if ( javaVersion =~ /(1\..+)|9|10/ ) { - assert new File( basedir, 'target/apidocs/com/foo/MyClass.html').exists() + assert new File( basedir, 'target/site/apidocs/com/foo/MyClass.html').exists() } else { - assert new File( basedir, 'target/apidocs/M.N/com/foo/MyClass.html').exists() -} + assert new File( basedir, 'target/site/apidocs/M.N/com/foo/MyClass.html').exists() +} diff --git a/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy b/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy index ad6c4621..8c5a23e6 100644 --- a/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy +++ b/src/it/projects/MJAVADOC-555_link-automatic-modules/verify.groovy @@ -20,9 +20,9 @@ def classFile int javaVersion = System.getProperty( "java.specification.version" ) as Integer if ( javaVersion >= 11 ) { - classFile = new File( basedir, 'target/apidocs/jul_to_slf4j/com/testcase/Testcase.html') + classFile = new File( basedir, 'target/site/apidocs/jul_to_slf4j/com/testcase/Testcase.html') } else { - classFile = new File( basedir, 'target/apidocs/com/testcase/Testcase.html') + classFile = new File( basedir, 'target/site/apidocs/com/testcase/Testcase.html') } assert classFile.exists() : "Can't locate ${classFile}" diff --git a/src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy b/src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy index a38349a0..88d201a8 100644 --- a/src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy +++ b/src/it/projects/MJAVADOC-575_source8-module-info/verify.groovy @@ -16,5 +16,5 @@ * specific language governing permissions and limitations * under the License. */ - -assert new File( basedir, 'target/apidocs/com/foo/MyClass.html').exists() + +assert new File( basedir, 'target/site/apidocs/com/foo/MyClass.html').exists() diff --git a/src/it/projects/MJAVADOC-610_mrjar/verify.groovy b/src/it/projects/MJAVADOC-610_mrjar/verify.groovy index bbed8f9e..3bb1fe0e 100644 --- a/src/it/projects/MJAVADOC-610_mrjar/verify.groovy +++ b/src/it/projects/MJAVADOC-610_mrjar/verify.groovy @@ -20,5 +20,5 @@ def file = new File( basedir, 'target/mjavadoc610-1.0-SNAPSHOT-javadoc.jar' ) assert file.exists() -assert new File( basedir, 'target/apidocs/com.foo/com/foo/MyClass.html').exists() -assert new File( basedir, 'target/apidocs/com.foo/com/foo/OtherClass.html').exists() +assert new File( basedir, 'target/site/apidocs/com.foo/com/foo/MyClass.html').exists() +assert new File( basedir, 'target/site/apidocs/com.foo/com/foo/OtherClass.html').exists() diff --git a/src/it/projects/MJAVADOC-618_modular-war/verify.groovy b/src/it/projects/MJAVADOC-618_modular-war/verify.groovy index d665081d..9b8fb2fa 100644 --- a/src/it/projects/MJAVADOC-618_modular-war/verify.groovy +++ b/src/it/projects/MJAVADOC-618_modular-war/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -assert new File( basedir, 'target/apidocs/argfile').readLines().size() == 2 -assert new File( basedir, 'target/apidocs/com.mycompany.lib/com/mycompany/lib/Library.html').exists() +assert new File( basedir, 'target/site/apidocs/argfile').readLines().size() == 2 +assert new File( basedir, 'target/site/apidocs/com.mycompany.lib/com/mycompany/lib/Library.html').exists() // module descriptor of com.mycompany.app has no exports, so nothing is documented -assert !new File( basedir, 'target/apidocs/com.mycompany.app/com/mycompany/app/Application.html').exists() +assert !new File( basedir, 'target/site/apidocs/com.mycompany.app/com/mycompany/app/Application.html').exists() diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy b/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy index 3cb9637c..d1007fbc 100644 --- a/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy +++ b/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy @@ -19,25 +19,25 @@ import java.util.jar.JarFile * specific language governing permissions and limitations * under the License. */ - + int javaVersion = System.getProperty( "java.specification.version" ) as Integer if ( javaVersion >= 11 ) { - def index = new File( basedir, 'target/apidocs/index.html') + def index = new File( basedir, 'target/site/apidocs/index.html') assert index.text =~ /modulea<\/a>/ assert index.text =~ /moduleb<\/a>/ - - assert new File( basedir, 'target/apidocs/modulea/module-summary.html').exists() - assert new File( basedir, 'target/apidocs/moduleb/module-summary.html').exists() -} + + assert new File( basedir, 'target/site/apidocs/modulea/module-summary.html').exists() + assert new File( basedir, 'target/site/apidocs/moduleb/module-summary.html').exists() +} else { def overview = new File( basedir, 'target/site/apidocs/overview-summary.html') assert overview.text =~ /modulea<\/a>/ assert overview.text =~ /moduleb<\/a>/ - - assert new File( basedir, 'target/site/apidocs/modulea-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/moduleb-summary.html').exists() + + assert new File( basedir, 'target/site/site/apidocs/modulea-summary.html').exists() + assert new File( basedir, 'target/site/site/apidocs/moduleb-summary.html').exists() } def aggregate = new File(basedir, 'target/MJAVADOC-639-1.0.0-SNAPSHOT-javadoc.jar') diff --git a/src/it/projects/MJAVADOC-769/pom.xml b/src/it/projects/MJAVADOC-769/pom.xml index b959e06c..ce95bb14 100644 --- a/src/it/projects/MJAVADOC-769/pom.xml +++ b/src/it/projects/MJAVADOC-769/pom.xml @@ -93,8 +93,6 @@ maven-javadoc-plugin @project.version@ - ${project.build.directory}/apidocs - 11 false false diff --git a/src/it/projects/MJAVADOC-770/verify.groovy b/src/it/projects/MJAVADOC-770/verify.groovy index 165abb14..933b06e5 100644 --- a/src/it/projects/MJAVADOC-770/verify.groovy +++ b/src/it/projects/MJAVADOC-770/verify.groovy @@ -18,6 +18,6 @@ */ // new style javadoc has a module summary. legacy mode has not. -def moduleFile = new File( basedir, 'target/apidocs/mjavadoc770/module-summary.html') +def moduleFile = new File( basedir, 'target/site/apidocs/mjavadoc770/module-summary.html') assert !moduleFile.exists() diff --git a/src/it/projects/dependencySource-1/verify.bsh b/src/it/projects/dependencySource-1/verify.bsh index af443a82..841288c5 100644 --- a/src/it/projects/dependencySource-1/verify.bsh +++ b/src/it/projects/dependencySource-1/verify.bsh @@ -1,51 +1,51 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; - -File distroTarget = new File( basedir, "MJAVADOC-280-1-distro/target" ); -File apidocs = new File( distroTarget, "apidocs" ); -File testApidocs = new File( distroTarget, "testapidocs" ); - -File f; -if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -return true; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; + +File distroTarget = new File( basedir, "MJAVADOC-280-1-distro/target/site" ); +File apidocs = new File( distroTarget, "apidocs" ); +File testApidocs = new File( distroTarget, "testapidocs" ); + +File f; +if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +return true; diff --git a/src/it/projects/dependencySource-2/verify.bsh b/src/it/projects/dependencySource-2/verify.bsh index e5b9af41..a600f94f 100644 --- a/src/it/projects/dependencySource-2/verify.bsh +++ b/src/it/projects/dependencySource-2/verify.bsh @@ -1,51 +1,51 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; - -File distroTarget = new File( basedir, "MJAVADOC-280-2-distro/target" ); -File apidocs = new File( distroTarget, "apidocs" ); -File testApidocs = new File( distroTarget, "testapidocs" ); - -File f; -if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -return true; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; + +File distroTarget = new File( basedir, "MJAVADOC-280-2-distro/target/site" ); +File apidocs = new File( distroTarget, "apidocs" ); +File testApidocs = new File( distroTarget, "testapidocs" ); + +File f; +if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +return true; diff --git a/src/it/projects/dependencySource-3/verify.bsh b/src/it/projects/dependencySource-3/verify.bsh index 4266397b..60add4ad 100644 --- a/src/it/projects/dependencySource-3/verify.bsh +++ b/src/it/projects/dependencySource-3/verify.bsh @@ -1,51 +1,51 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; - -File distroTarget = new File( basedir, "MJAVADOC-280-3-distro/target" ); -File apidocs = new File( distroTarget, "apidocs" ); -File testApidocs = new File( distroTarget, "testapidocs" ); - -File f; -if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -return true; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; + +File distroTarget = new File( basedir, "MJAVADOC-280-3-distro/target/site" ); +File apidocs = new File( distroTarget, "apidocs" ); +File testApidocs = new File( distroTarget, "testapidocs" ); + +File f; +if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +return true; diff --git a/src/it/projects/dependencySource-4/verify.bsh b/src/it/projects/dependencySource-4/verify.bsh index 4216b3e2..1bc91ee3 100644 --- a/src/it/projects/dependencySource-4/verify.bsh +++ b/src/it/projects/dependencySource-4/verify.bsh @@ -1,51 +1,51 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; - -File distroTarget = new File( basedir, "MJAVADOC-280-4-distro/target" ); -File apidocs = new File( distroTarget, "apidocs" ); -File testApidocs = new File( distroTarget, "testapidocs" ); - -File f; -if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() ) -{ - System.out.println( f + " does not exist!" ); - return false; -} - -return true; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; + +File distroTarget = new File( basedir, "MJAVADOC-280-4-distro/target/site" ); +File apidocs = new File( distroTarget, "apidocs" ); +File testApidocs = new File( distroTarget, "testapidocs" ); + +File f; +if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/moda/App.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( apidocs, "org/apache/maven/plugins/mjavadoc/it/modb/App.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/moda/AppTest.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +if ( !( f = new File( testApidocs, "org/apache/maven/plugins/mjavadoc/it/modb/AppTest.html" ) ).exists() ) +{ + System.out.println( f + " does not exist!" ); + return false; +} + +return true; diff --git a/src/it/projects/reproducible/verify.groovy b/src/it/projects/reproducible/verify.groovy index 3033be71..47771b45 100644 --- a/src/it/projects/reproducible/verify.groovy +++ b/src/it/projects/reproducible/verify.groovy @@ -24,7 +24,7 @@ import java.util.jar.*; def target = new File( basedir, 'target' ) assert target.isDirectory() -def apidocs = new File( target, 'apidocs' ) +def apidocs = new File( target, 'site/apidocs' ) assert apidocs.isDirectory() def options = new File( apidocs, 'options' ) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index e7028345..a7ec9e17 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -1218,14 +1218,15 @@ public abstract class AbstractJavadocMojo extends AbstractMojo { private OfflineLink[] offlineLinks; /** - * Specifies the destination directory where javadoc saves the generated HTML files. + * The shared output directory for the report where Javadoc saves the generated HTML files. + * Note that this parameter is only evaluated if the goal is run directly from the command line. + * If the goal is run indirectly as part of a site generation, the shared output directory configured in the + * Maven Site Plugin + * is used instead. + * @see org.apache.maven.reporting.AbstractMavenReport#outputDirectory * @see Doclet option d */ - @Parameter( - property = "destDir", - alias = "destDir", - defaultValue = "${project.build.directory}/apidocs", - required = true) + @Parameter(defaultValue = "${project.reporting.outputDirectory}", readonly = true, required = true) protected File outputDirectory; /** @@ -1684,11 +1685,18 @@ protected boolean isTest() { return false; } + protected String getOutputDirectory() { + return outputDirectory.getAbsolutePath(); + } + /** - * @return the output directory + * Method that returns the plugin report output directory where the generated Javadoc report will be put + * beneath {@link #getOutputDirectory()}/{@link org.apache.maven.reporting.AbstractMavenReport#getReportOutputDirectory()}. + * + * @return a String that contains the target directory */ - protected String getOutputDirectory() { - return outputDirectory.getAbsoluteFile().toString(); + protected String getPluginReportOutputDirectory() { + return getOutputDirectory() + "/" + (isTest() ? "test" : "") + "apidocs"; } protected MavenProject getProject() { @@ -1832,7 +1840,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { doExecute(); } - abstract void doExecute() throws MojoExecutionException, MojoFailureException; + protected abstract void doExecute() throws MojoExecutionException, MojoFailureException; protected final void verifyRemovedParameter(String paramName) { Xpp3Dom configDom = mojoExecution.getConfiguration(); @@ -1862,11 +1870,6 @@ private void verifyReplacedParameter(String oldParamName, String newParamNew) { * @throws MavenReportException if any */ protected void executeReport(Locale unusedLocale) throws MavenReportException { - if (skip) { - getLog().info("Skipping javadoc generation"); - return; - } - if (getLog().isDebugEnabled()) { this.debug = true; } @@ -1912,12 +1915,12 @@ protected void executeReport(Locale unusedLocale) throws MavenReportException { // Javadoc output directory as File // ---------------------------------------------------------------------- - File javadocOutputDirectory = new File(getOutputDirectory()); + File javadocOutputDirectory = new File(getPluginReportOutputDirectory()); if (javadocOutputDirectory.exists() && !javadocOutputDirectory.isDirectory()) { - throw new MavenReportException("IOException: " + getOutputDirectory() + " is not a directory."); + throw new MavenReportException("IOException: " + javadocOutputDirectory + " is not a directory."); } if (javadocOutputDirectory.exists() && !javadocOutputDirectory.canWrite()) { - throw new MavenReportException("IOException: " + getOutputDirectory() + " is not writable."); + throw new MavenReportException("IOException: " + javadocOutputDirectory + " is not writable."); } javadocOutputDirectory.mkdirs(); @@ -5436,7 +5439,7 @@ private List getModulesLinks() throws MavenReportException { } List modulesLinks = new ArrayList<>(); - String javadocDirRelative = PathUtils.toRelative(project.getBasedir(), getOutputDirectory()); + String javadocDirRelative = PathUtils.toRelative(project.getBasedir(), getPluginReportOutputDirectory()); for (MavenProject p : aggregatedProjects) { if (!dependencyArtifactIds.contains(p.getArtifact().getId()) || (p.getUrl() == null)) { continue; @@ -5729,7 +5732,7 @@ protected boolean isValidJavadocLink(String link, boolean detecting) { // links can be relative paths or files File dir = new File(link); if (!dir.isAbsolute()) { - dir = new File(getOutputDirectory(), link); + dir = new File(getPluginReportOutputDirectory(), link); } if (!dir.isDirectory()) { if (detecting) { diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java index 98bed568..5312e032 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java @@ -94,15 +94,6 @@ public class JavadocJar extends AbstractJavadocMojo { // Mojo Parameters // ---------------------------------------------------------------------- - /** - * Specifies the destination directory where javadoc saves the generated HTML files. - * @see Doclet option d. - * @deprecated - */ - @Deprecated - @Parameter(property = "destDir") - private File destDir; - /** * Specifies the directory where the generated jar file will be put. */ @@ -164,11 +155,6 @@ public void doExecute() throws MojoExecutionException { return; } - File innerDestDir = this.destDir; - if (innerDestDir == null) { - innerDestDir = new File(getOutputDirectory()); - } - if (!isAggregator() || !"pom".equalsIgnoreCase(project.getPackaging())) { ArtifactHandler artifactHandler = project.getArtifact().getArtifactHandler(); if (!"java".equals(artifactHandler.getLanguage())) { @@ -185,25 +171,24 @@ public void doExecute() throws MojoExecutionException { failOnError("RuntimeException: Error while generating Javadoc", e); } - if (innerDestDir.exists()) { - try { - File outputFile = generateArchive(innerDestDir, finalName + "-" + getClassifier() + ".jar"); - - if (!attach) { - getLog().info("NOT adding javadoc to attached artifacts list."); - } else { - // TODO: these introduced dependencies on the project are going to become problematic - can we - // export it - // through metadata instead? - projectHelper.attachArtifact(project, "javadoc", getClassifier(), outputFile); - } - } catch (ArchiverException e) { - failOnError("ArchiverException: Error while creating archive", e); - } catch (IOException e) { - failOnError("IOException: Error while creating archive", e); - } catch (RuntimeException e) { - failOnError("RuntimeException: Error while creating archive", e); + try { + File outputFile = generateArchive( + new File(getPluginReportOutputDirectory()), finalName + "-" + getClassifier() + ".jar"); + + if (!attach) { + getLog().info("NOT adding javadoc to attached artifacts list."); + } else { + // TODO: these introduced dependencies on the project are going to become problematic - can we + // export it + // through metadata instead? + projectHelper.attachArtifact(project, "javadoc", getClassifier(), outputFile); } + } catch (ArchiverException e) { + failOnError("ArchiverException: Error while creating archive", e); + } catch (IOException e) { + failOnError("IOException: Error while creating archive", e); + } catch (RuntimeException e) { + failOnError("RuntimeException: Error while creating archive", e); } } diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java index b5058fcc..e39f6ec8 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java @@ -26,6 +26,7 @@ import java.util.ResourceBundle; import java.util.stream.Collectors; +import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; import org.apache.maven.doxia.siterenderer.DocumentRenderingContext; @@ -57,24 +58,9 @@ public class JavadocReport extends AbstractJavadocMojo implements MavenMultiPage // Report Mojo Parameters // ---------------------------------------------------------------------- - /** - * Specifies the destination directory where javadoc saves the generated HTML files. - */ - @Parameter( - property = "reportOutputDirectory", - defaultValue = "${project.reporting.outputDirectory}/apidocs", - required = true) + /** The current shared report output directory to use */ private File reportOutputDirectory; - /** - * The name of the destination directory. - *
- * - * @since 2.1 - */ - @Parameter(property = "destDir", defaultValue = "apidocs") - private String destDir; - /** * The name of the Javadoc report to be displayed in the Maven Generated Reports page * (i.e. project-reports.html). @@ -125,8 +111,6 @@ public void generate(Sink sink, Locale locale) throws MavenReportException { /** {@inheritDoc} */ @Override public void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws MavenReportException { - outputDirectory = getReportOutputDirectory(); - try { executeReport(locale); } catch (MavenReportException | RuntimeException e) { @@ -140,7 +124,7 @@ public void generate(Sink sink, SinkFactory sinkFactory, Locale locale) throws M /** {@inheritDoc} */ @Override public String getOutputName() { - return destDir + "/index"; + return (isTest() ? "test" : "") + "apidocs" + "/index"; } /** {@inheritDoc} */ @@ -214,25 +198,31 @@ public boolean isExternalReport() { * */ @Override - public boolean canGenerateReport() { - boolean canGenerate = false; - - if (!skip && (this.isAggregator() || !"pom".equals(this.project.getPackaging()))) { - Collection sourcePaths; - Map> files; - try { - sourcePaths = getSourcePaths().stream() - .flatMap(e -> e.getSourcePaths().stream()) - .collect(Collectors.toList()); - files = getFiles(sourcePaths); - } catch (MavenReportException e) { - getLog().error(e.getMessage(), e); + public boolean canGenerateReport() throws MavenReportException { + if (skip) { + return false; + } + + if (!isAggregator() || !"pom".equals(this.project.getPackaging())) { + ArtifactHandler artifactHandler = project.getArtifact().getArtifactHandler(); + if (!"java".equals(artifactHandler.getLanguage())) { + getLog().debug("Not executing Javadoc as the project is not a Java classpath-capable package"); return false; } + } + + Collection sourcePaths = getSourcePaths(); - canGenerate = canGenerateReport(files); + Collection collectedSourcePaths = + sourcePaths.stream().flatMap(e -> e.getSourcePaths().stream()).collect(Collectors.toList()); + + Map> files = getFiles(collectedSourcePaths); + + if (!canGenerateReport(files)) { + return false; } - return canGenerate; + + return true; } /** {@inheritDoc} */ @@ -245,43 +235,38 @@ public String getCategoryName() { @Override public File getReportOutputDirectory() { if (reportOutputDirectory == null) { - return outputDirectory; + reportOutputDirectory = new File(getOutputDirectory()); } return reportOutputDirectory; } - /** - * Method to set the directory where the generated reports will be put - * - * @param reportOutputDirectory the directory file to be set - */ + /** {@inheritDoc} */ @Override public void setReportOutputDirectory(File reportOutputDirectory) { - updateReportOutputDirectory(reportOutputDirectory, destDir); - } - - /** - * @param theDestDir the destination directory - */ - public void setDestDir(String theDestDir) { - this.destDir = theDestDir; - updateReportOutputDirectory(reportOutputDirectory, theDestDir); + this.reportOutputDirectory = reportOutputDirectory; + this.outputDirectory = reportOutputDirectory; } - private void updateReportOutputDirectory(File reportOutputDirectory, String destDir) { - if (reportOutputDirectory != null - && destDir != null - && !reportOutputDirectory.getAbsolutePath().endsWith(destDir)) { - this.reportOutputDirectory = new File(reportOutputDirectory, destDir); - } else { - this.reportOutputDirectory = reportOutputDirectory; - } + /** {@inheritDoc} */ + @Override + protected String getPluginReportOutputDirectory() { + return getReportOutputDirectory().getAbsolutePath() + "/" + (isTest() ? "test" : "") + "apidocs"; } /** {@inheritDoc} */ @Override - public void doExecute() throws MojoExecutionException, MojoFailureException { + protected void doExecute() throws MojoExecutionException, MojoFailureException { + try { + if (!canGenerateReport()) { + String reportMojoInfo = mojoExecution.getPlugin().getId() + ":" + mojoExecution.getGoal(); + getLog().info("Skipping " + reportMojoInfo + " report goal"); + return; + } + } catch (MavenReportException e) { + throw new MojoExecutionException("Failed to determine whether report can be generated", e); + } + File outputDirectory = new File(getOutputDirectory()); String filename = getOutputName() + ".html"; diff --git a/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java index 60d7e08e..2490f102 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java @@ -94,6 +94,11 @@ public class ResourcesBundleMojo extends AbstractJavadocMojo { */ @Override public void doExecute() throws MojoExecutionException, MojoFailureException { + if (skip) { + getLog().info("Skipping javadoc generation"); + return; + } + try { buildJavadocOptions(); } catch (IOException e) { diff --git a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java index 3da91822..b486bd65 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java @@ -52,13 +52,6 @@ public class TestJavadocJar extends JavadocJar { // Javadoc Options (should be inline with Javadoc options defined in TestJavadocReport) // ---------------------------------------------------------------------- - /** - * Specifies the destination directory where Javadoc saves the generated HTML files. - * @see Doclet option d. - */ - @Parameter(defaultValue = "${project.build.directory}/testapidocs", required = true) - private File outputDirectory; - /** * Specifies the Test title to be placed near the top of the overview summary file. * @see Doclet option doctitle. @@ -124,11 +117,6 @@ protected String getClassifier() { // Important Note: should be inline with methods defined in TestJavadocReport // ---------------------------------------------------------------------- - @Override - protected String getOutputDirectory() { - return outputDirectory.getAbsoluteFile().toString(); - } - @Override protected File getJavadocDirectory() { return testJavadocDirectory; diff --git a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java index c65085bf..63d1d659 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java @@ -92,22 +92,6 @@ public class TestJavadocReport extends JavadocReport { // Mojo Parameters (should be inline with options defined in TestJavadocJar) // ---------------------------------------------------------------------- - /** - * Specifies the destination directory where test Javadoc saves the generated HTML files. - */ - @Parameter( - property = "reportTestOutputDirectory", - defaultValue = "${project.reporting.outputDirectory}/testapidocs", - required = true) - private File reportOutputDirectory; - - /** - * The name of the destination directory. - *
- */ - @Parameter(property = "destDir", defaultValue = "testapidocs") - private String destDir; - /** * Specifies the Test Javadoc resources directory to be included in the Javadoc (i.e. package.html, images...). *
@@ -171,46 +155,6 @@ public String getDescription(Locale locale) { return testDescription; } - @Override - public String getOutputName() { - return destDir + "/index"; - } - - @Override - public File getReportOutputDirectory() { - if (reportOutputDirectory == null) { - return outputDirectory; - } - - return reportOutputDirectory; - } - - /** - * Method to set the directory where the generated reports will be put - * - * @param reportOutputDirectory the directory file to be set - */ - @Override - public void setReportOutputDirectory(File reportOutputDirectory) { - updateReportOutputDirectory(reportOutputDirectory, destDir); - } - - @Override - public void setDestDir(String destDir) { - this.destDir = destDir; - updateReportOutputDirectory(reportOutputDirectory, destDir); - } - - private void updateReportOutputDirectory(File reportOutputDirectory, String destDir) { - if (reportOutputDirectory != null - && destDir != null - && !reportOutputDirectory.getAbsolutePath().endsWith(destDir)) { - this.reportOutputDirectory = new File(reportOutputDirectory, destDir); - } else { - this.reportOutputDirectory = reportOutputDirectory; - } - } - // ---------------------------------------------------------------------- // Protected methods // Important Note: should be inline with methods defined in TestJavadocJar @@ -298,8 +242,7 @@ private void addMainJavadocLink() { links = new ArrayList<>(); } - // TODO the prerequisite is that the main report is in apidocs - File apidocs = new File(getReportOutputDirectory().getParentFile(), "apidocs"); + File apidocs = new File(getReportOutputDirectory(), "apidocs"); if (apidocs.isDirectory() && !links.contains("../apidocs")) { links.add("../apidocs"); } diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java index 49719af3..82ed8cdd 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java @@ -135,25 +135,6 @@ public void testDefaultConfig() throws Exception { assertThat(generatedFile).exists(); } - /** - * Test when the specified destDir parameter has an invalid value - * - * @throws Exception if any - */ - public void testInvalidDestdir() throws Exception { - File testPom = new File( - getBasedir(), - "src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml"); - JavadocJar mojo = lookupMojo(testPom); - mojo.execute(); - - // check if the javadoc jar file was generated - File generatedFile = new File( - getBasedir(), - "target/test/unit/javadocjar-invalid-destdir/target/javadocjar-invalid-destdir-javadoc.jar"); - assertThat(generatedFile).doesNotExist(); - } - public void testContinueIfFailOnErrorIsFalse() throws Exception { File testPom = new File( getBasedir(), diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java index cb282d07..85494ccc 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java @@ -505,7 +505,7 @@ public void testDoclets() throws Exception { new File(getBasedir(), "target/test/unit/doclet-test/target/site/apidocs/graph.dot").toPath(); assertThat(generatedFile).exists(); - Path optionsFile = new File(mojo.getOutputDirectory(), "options").toPath(); + Path optionsFile = new File(mojo.getPluginReportOutputDirectory(), "options").toPath(); assertThat(optionsFile).exists(); String options = readFile(optionsFile); assertThat(options).contains("/target/local-repo/umlgraph/UMLGraph/2.1/UMLGraph-2.1.jar"); @@ -524,7 +524,7 @@ public void testDoclets() throws Exception { generatedFile = new File(getBasedir(), "target/test/unit/doclet-test/target/site/apidocs/graph.dot").toPath(); assertThat(generatedFile).exists(); - optionsFile = new File(mojo.getOutputDirectory(), "options").toPath(); + optionsFile = new File(mojo.getPluginReportOutputDirectory(), "options").toPath(); assertThat(optionsFile).exists(); options = readFile(optionsFile); assertThat(options) @@ -571,7 +571,7 @@ public void testOptionsUmlautEncoding() throws Exception { JavadocReport mojo = lookupMojo(testPom); mojo.execute(); - Path optionsFile = new File(mojo.getOutputDirectory(), "options").toPath(); + Path optionsFile = new File(mojo.getPluginReportOutputDirectory(), "options").toPath(); assertThat(optionsFile).exists(); // check for a part of the window title @@ -1096,7 +1096,7 @@ public void testTagletArtifacts() throws Exception { setVariableValueToObject(mojo, "repoSession", repoSysSession); mojo.execute(); - Path optionsFile = new File(mojo.getOutputDirectory(), "options").toPath(); + Path optionsFile = new File(mojo.getPluginReportOutputDirectory(), "options").toPath(); assertThat(optionsFile).exists(); String options = readFile(optionsFile); // count -taglet diff --git a/src/test/java/org/apache/maven/plugins/javadoc/TestJavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/TestJavadocReportTest.java index 3f8d02a6..c60e0a1a 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/TestJavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/TestJavadocReportTest.java @@ -59,10 +59,10 @@ public void testTestJavadoc() throws Exception { mojo.execute(); File generatedFile = - new File(getBasedir(), "target/test/unit/test-javadoc-test/target/site/apidocs/maven/AppTest.html"); + new File(getBasedir(), "target/test/unit/test-javadoc-test/target/site/testapidocs/maven/AppTest.html"); assertThat(generatedFile).exists(); - File options = new File(getBasedir(), "target/test/unit/test-javadoc-test/target/site/apidocs/options"); + File options = new File(getBasedir(), "target/test/unit/test-javadoc-test/target/site/testapidocs/options"); assertThat(FileUtils.fileRead(options)).contains("junit-3.8.1.jar"); } } diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/AbstractAggregateMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/AbstractAggregateMavenProjectStub.java index ecef7a61..c7454db4 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/AbstractAggregateMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/AbstractAggregateMavenProjectStub.java @@ -50,6 +50,13 @@ public AbstractAggregateMavenProjectStub( setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("pom"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + setExecutionRoot(true); Build build = new Build(); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java index 14a614c0..14507d6c 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java @@ -47,6 +47,13 @@ public AggregateTestMavenProjectStub() { setPackaging(getModel().getPackaging()); setExecutionRoot(true); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setDirectory(super.getBasedir() + "/target/test/unit/aggregate-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java index 25a0197e..772e4cbb 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java @@ -51,6 +51,13 @@ public CustomConfigurationMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName("default-configuration"); build.setDirectory(super.getBasedir() + "/target/test/unit/custom-configuration/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java index 4277b215..c9bcdc3e 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java @@ -46,6 +46,13 @@ public DefaultConfigurationMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName("default-configuration"); build.setDirectory(super.getBasedir() + "/target/test/unit/default-configuration/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java index 28bb773d..c8f31283 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java @@ -47,6 +47,13 @@ public DocfilesTestMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName("docfiles-test"); build.setDirectory(super.getBasedir() + "/target/test/unit/docfiles-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java index eb6a3f38..3647be65 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java @@ -37,6 +37,13 @@ public DocfilesWithJavaTestMavenProjectStub() { setVersion(getModel().getVersion()); setPackaging("jar"); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName("docfiles-with-java-test"); build.setDirectory(super.getBasedir() + "/target/test/unit/docfiles-with-java-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java index 5ef9d717..d75a2151 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java @@ -46,6 +46,13 @@ public DocletPathTestMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setDirectory(super.getBasedir() + "/target/test/unit/doclet-path-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java index e0d0596f..7a449101 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java @@ -47,6 +47,13 @@ public DocletTestMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setDirectory(super.getBasedir() + "/target/test/unit/doclet-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java index 019f752a..30531c26 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java @@ -39,6 +39,13 @@ public HeaderFooterTestMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java index 2a9e566c..343e50e7 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java @@ -44,6 +44,13 @@ public HelpFileMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java index 7c259e00..c1cdc58a 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java @@ -52,7 +52,7 @@ public JavadocJarArchiveConfigProjectStub() { JavadocPluginArtifactStub artifact = new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); - artifact.setType("jar"); + artifact.setType("pom"); artifact.setBaseVersion("1.0-SNAPSHOT"); setArtifact(artifact); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java index 352ee3e1..2e4f9f47 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java @@ -46,6 +46,13 @@ public Jdk5TestMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setDirectory(super.getBasedir() + "/target/test/unit/jdk5-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java index 93ebc8d9..6ba02948 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java @@ -46,6 +46,13 @@ public Jdk6TestMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setDirectory(super.getBasedir() + "/target/test/unit/jdk6-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java index 4fe51bd6..3efbdee5 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java @@ -39,6 +39,13 @@ public NewlineTestMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/OptionsUmlautEncodingMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/OptionsUmlautEncodingMavenProjectStub.java index 56d8a971..89980bcd 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/OptionsUmlautEncodingMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/OptionsUmlautEncodingMavenProjectStub.java @@ -43,6 +43,13 @@ public OptionsUmlautEncodingMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName("optionsumlautencoding-test"); build.setDirectory(super.getBasedir() + "/target/test/unit/optionsumlautencoding-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java index 6327d321..b18f7e03 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java @@ -39,6 +39,13 @@ public PomMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("pom"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setDirectory(super.getBasedir() + "/target/test/unit/pom-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java index d479a1a6..816fe772 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java @@ -47,6 +47,13 @@ public ProxyTestMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub projArtifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + projArtifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + projArtifact.setType("jar"); + projArtifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(projArtifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java index 06e1d9ba..35e2ff57 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java @@ -46,6 +46,13 @@ public QuotedPathMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName("quotedpath-test"); build.setDirectory(super.getBasedir() + "/target/test/unit/quotedpath'test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java index 673fa809..cbb9eb20 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java @@ -39,6 +39,13 @@ public ResourcesTestMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java index 919e60b7..2efa466b 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java @@ -39,6 +39,13 @@ public ResourcesWithExcludesTestMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java index 6fb5e21f..0ff9b45c 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java @@ -39,6 +39,13 @@ public StandardDocletConflictOptionsTestMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java index 45e7a515..698c4827 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java @@ -44,6 +44,13 @@ public StylesheetFileMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java index 8ce5d2cc..7049bd3d 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java @@ -46,6 +46,13 @@ public SubpackagesTestMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName("subpackages-test"); build.setDirectory(super.getBasedir() + "/target/test/unit/subpackages-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java index 12cf79eb..ffb05a0f 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java @@ -39,6 +39,13 @@ public TagTestMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java index 93e9bab9..03c21aa0 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java @@ -44,6 +44,13 @@ public TagletArtifactsMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java index 10239d9f..d8ca5e1a 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java @@ -46,6 +46,13 @@ public TagletTestMavenProjectStub() { scm.setConnection("scm:svn:http://svn.apache.org/maven/sample/trunk"); setScm(scm); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setDirectory(super.getBasedir() + "/target/test/unit/taglet-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java index 946699b5..0f835043 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java @@ -46,6 +46,13 @@ public TestJavadocMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setDirectory(super.getBasedir() + "/target/test/unit/test-javadoc-test/target"); diff --git a/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java index aa608eca..6fa41c0a 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java @@ -39,6 +39,13 @@ public WrongEncodingOptionsTestMavenProjectStub() { setUrl(getModel().getUrl()); setPackaging(getModel().getPackaging()); + JavadocPluginArtifactStub artifact = + new JavadocPluginArtifactStub(getGroupId(), getArtifactId(), getVersion(), getPackaging()); + artifact.setArtifactHandler(new DefaultArtifactHandlerStub()); + artifact.setType("jar"); + artifact.setBaseVersion("1.0-SNAPSHOT"); + setArtifact(artifact); + Build build = new Build(); build.setFinalName(getModel().getArtifactId()); build.setSourceDirectory(getBasedir() + "/src/main/java"); diff --git a/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml b/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml index 2d35f145..4001ac32 100644 --- a/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml +++ b/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/all/pom.xml @@ -1,62 +1,62 @@ - - - 4.0.0 - - org.apache.maven.plugins.maven-javadoc-plugin.unit - aggregate-modules-not-in-subfolders-test-resources-test - 1.0-SNAPSHOT - pom - - - ../project1 - ../project2 - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - ISO-8859-1 - - ${basedir}/target/test/unit/aggregate-modules-not-in-subfolders-test/target/site/apidocs - ${basedir}/target/test/unit/aggregate-modules-not-in-subfolders-test/target/javadoc-bundle-options - Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API - - - - - - - protected - - - true - ${basedir}/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/src/main/javadoc - true - true - java - true - - - - - + + + 4.0.0 + + org.apache.maven.plugins.maven-javadoc-plugin.unit + aggregate-modules-not-in-subfolders-test-resources-test + 1.0-SNAPSHOT + pom + + + ../project1 + ../project2 + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ISO-8859-1 + + ${basedir}/target/test/unit/aggregate-modules-not-in-subfolders-test/target/site + ${basedir}/target/test/unit/aggregate-modules-not-in-subfolders-test/target/javadoc-bundle-options + Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API + + + + + + + protected + + + true + ${basedir}/src/test/resources/unit/aggregate-modules-not-in-subfolders-test/src/main/javadoc + true + true + java + true + + + + + diff --git a/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml b/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml index b85d1179..97367dc1 100644 --- a/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml +++ b/src/test/resources/unit/aggregate-resources-test/aggregate-resources-test-plugin-config.xml @@ -35,7 +35,7 @@ under the License. ISO-8859-1 - ${basedir}/target/test/unit/aggregate-resources-test/target/site/apidocs + ${basedir}/target/test/unit/aggregate-resources-test/target/site ${basedir}/target/test/unit/aggregate-resources-test/target/javadoc-bundle-options Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API diff --git a/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml b/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml index a0c318b6..ccb54906 100644 --- a/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml +++ b/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml @@ -35,7 +35,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/aggregate-test/target/site/apidocs + ${basedir}/target/test/unit/aggregate-test/target/site ${basedir}/target/test/unit/aggregate-test/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml b/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml index 6ed8ad0b..7bbe8fae 100644 --- a/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml +++ b/src/test/resources/unit/custom-configuration/custom-configuration-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/custom-configuration/target/site/apidocs + ${basedir}/target/test/unit/custom-configuration/target/site ${basedir}/target/test/unit/custom-configuration/target/javadoc-bundle-options false true diff --git a/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml b/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml index ea9799f7..ff2e928d 100644 --- a/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml +++ b/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/default-configuration/target/site/apidocs + ${basedir}/target/test/unit/default-configuration/target/site ${basedir}/target/test/unit/default-configuration/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml b/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml index a77c595e..98d96038 100644 --- a/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml +++ b/src/test/resources/unit/docfiles-test/docfiles-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/docfiles-test/target/site/apidocs + ${basedir}/target/test/unit/docfiles-test/target/site ${basedir}/target/test/unit/docfiles-test/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml b/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml index cb7d6310..6938ceaa 100644 --- a/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml +++ b/src/test/resources/unit/docfiles-with-java-test/docfiles-with-java-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/docfiles-with-java-test/target/site/apidocs + ${basedir}/target/test/unit/docfiles-with-java-test/target/site ${basedir}/target/test/unit/docfiles-with-java-test/target/javadoc-bundle-options ${basedir}/src/test/resources/unit/docfiles-with-java-test/src/main false diff --git a/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml b/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml index e3ced151..44a1c9d9 100644 --- a/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml +++ b/src/test/resources/unit/doclet-path-test/doclet-path-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/doclet-path-test/target/site/apidocs + ${basedir}/target/test/unit/doclet-path-test/target/site ${basedir}/target/test/unit/doclet-path-test/target/javadoc-bundle-options UmlGraph diff --git a/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml b/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml index bf3f197e..80b5dcaf 100644 --- a/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml +++ b/src/test/resources/unit/doclet-test/doclet-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/doclet-test/target/site/apidocs + ${basedir}/target/test/unit/doclet-test/target/site ${basedir}/target/test/unit/doclet-test/target/javadoc-bundle-options UmlGraph diff --git a/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml b/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml index 62899993..616a1225 100644 --- a/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml +++ b/src/test/resources/unit/file-include-exclude-test/file-include-exclude-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/file-include-exclude-test/target/site/apidocs + ${basedir}/target/test/unit/file-include-exclude-test/target/site ${basedir}/target/test/unit/file-include-exclude-test/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml b/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml index 3793d127..98d4e51e 100644 --- a/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml +++ b/src/test/resources/unit/header-footer-test/header-footer-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/header-footer-test/target/site/apidocs + ${basedir}/target/test/unit/header-footer-test/target/site ${basedir}/target/test/unit/header-footer-test/target/javadoc-bundle-options protected ISO-8859-1 diff --git a/src/test/resources/unit/helpfile-test/artifact-helpfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom b/src/test/resources/unit/helpfile-test/artifact-helpfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom index 0a0da4f0..6235931b 100644 --- a/src/test/resources/unit/helpfile-test/artifact-helpfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom +++ b/src/test/resources/unit/helpfile-test/artifact-helpfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/helpfile-test/1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom @@ -35,7 +35,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/helpfile-test/target/site/apidocs + ${basedir}/target/test/unit/helpfile-test/target/site ${basedir}/src/test/resources/unit/helpfile-test/src/main/javadoc false false diff --git a/src/test/resources/unit/helpfile-test/pom.xml b/src/test/resources/unit/helpfile-test/pom.xml index 014927a9..097e36bf 100644 --- a/src/test/resources/unit/helpfile-test/pom.xml +++ b/src/test/resources/unit/helpfile-test/pom.xml @@ -35,7 +35,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/helpfile-test/target/site/apidocs + ${basedir}/target/test/unit/helpfile-test/target/site ${basedir}/target/test/unit/helpfile-test/target/javadoc-bundle-options ${basedir}/src/test/resources/unit/helpfile-test/src/main/javadoc false diff --git a/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml b/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml index 65ef5ee3..308c5ad7 100644 --- a/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml +++ b/src/test/resources/unit/javaHome-test/javaHome-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/javaHome-test/target/site/apidocs + ${basedir}/target/test/unit/javaHome-test/target/site ${basedir}/target/test/unit/javaHome-test/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml b/src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml index f669fd3c..cbbcea6b 100644 --- a/src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml +++ b/src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml @@ -35,7 +35,7 @@ under the License. ${basedir}/target/test/unit/javadocjar-archive-config/target - ${basedir}/target/test/unit/javadocjar-archive-config/target/site/apidocs + ${basedir}/target/test/unit/javadocjar-archive-config/target/site ${basedir}/target/test/unit/javadocjar-archive-config/target/javadoc-bundle-options javadocjar-archive-config javadoc diff --git a/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml b/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml index 28300521..de9d611f 100644 --- a/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml +++ b/src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml @@ -35,7 +35,7 @@ under the License. ${basedir}/target/test/unit/javadocjar-default/target - ${basedir}/target/test/unit/javadocjar-default/target/site/apidocs + ${basedir}/target/test/unit/javadocjar-default/target/site ${basedir}/target/test/unit/javadocjar-default/target/javadoc-bundle-options javadocjar-default javadoc diff --git a/src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml b/src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml index a91920fc..f0c160e9 100644 --- a/src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml +++ b/src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml @@ -35,7 +35,7 @@ under the License. ${basedir}/target/test/unit/javadocjar-failonerror/target - ${basedir}/target/test/unit/javadocjar-failonerror/target/site/apidocs + ${basedir}/target/test/unit/javadocjar-failonerror/target/site ${basedir}/target/test/unit/javadocjar-failonerror/target/javadoc-bundle-options javadocjar-failonerror true diff --git a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml b/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml deleted file mode 100644 index 638c4d24..00000000 --- a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - 4.0.0 - org.apache.maven.plugins.maven-javadoc-plugin.unit - javadocjar-invalid-destdir - jar - 1.0-SNAPSHOT - 2006 - Maven Javadoc Plugin Javadoc Jar Invalid Destdir Test - http://maven.apache.org - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - ${basedir}/target/test/unit/javadocjar-invalid-destdir/target/invalid - ${basedir}/target/test/unit/javadocjar-invalid-destdir/target - ${basedir}/target/test/unit/javadocjar-invalid-destdir/target/site/apidocs - ${basedir}/target/test/unit/javadocjar-invalid-destdir/target/javadoc-bundle-options - javadocjar-invalid-destdir - true - false - false - protected - true - false - true - ISO-8859-1 - false - false - false - false - false - false - false - false - false - false - false - false - java - - - true - true - Maven Javadoc Plugin Javadoc Jar Invalid Destdir Test 1.0-SNAPSHOT API - true - true - - - - - - - - diff --git a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar/invalid/destdir/App.java b/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar/invalid/destdir/App.java deleted file mode 100644 index fbfd6ba1..00000000 --- a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar/invalid/destdir/App.java +++ /dev/null @@ -1,50 +0,0 @@ -package javadocjar.invalid.destdir; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * This is a sample app class with javadoc - * - * @author Maria Odea Ching - */ -public class App -{ - - /** - * The main method - * - * @param args an array of strings that contains the arguments - */ - public static void main( String[] args ) - { - System.out.println( "Sample Application." ); - } - - /** - * Sample method - * - * @param str the string to be displayed - */ - protected void sampleMethod( String str ) - { - System.out.println( str ); - } - -} \ No newline at end of file diff --git a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar/invalid/destdir/AppSample.java b/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar/invalid/destdir/AppSample.java deleted file mode 100644 index 2e512687..00000000 --- a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar/invalid/destdir/AppSample.java +++ /dev/null @@ -1,45 +0,0 @@ -package javadocjar.invalid.destdir; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * This is a sample class with javadoc - * - * @author Maria Odea Ching - */ -public class AppSample -{ - - /** - * Variable that holds the test value - */ - private String str = "TEST"; - - /** - * The main method - * - * @param args an array of strings that contains the arguments - */ - public static void main( String[] args ) - { - System.out.println( "Another Sample Application" ); - } - -} \ No newline at end of file diff --git a/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml b/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml index ff0d75db..619e3524 100644 --- a/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml +++ b/src/test/resources/unit/jdk5-test/jdk5-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/jdk5-test/target/site/apidocs + ${basedir}/target/test/unit/jdk5-test/target/site ${basedir}/target/test/unit/jdk5-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml b/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml index 5221029c..d7293921 100644 --- a/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml +++ b/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/jdk6-test/target/site/apidocs + ${basedir}/target/test/unit/jdk6-test/target/site ${basedir}/target/test/unit/jdk6-test/target/javadoc-bundle-options protected ISO-8859-1 diff --git a/src/test/resources/unit/newline-test/newline-test-plugin-config.xml b/src/test/resources/unit/newline-test/newline-test-plugin-config.xml index 447134e2..3e89f1bf 100644 --- a/src/test/resources/unit/newline-test/newline-test-plugin-config.xml +++ b/src/test/resources/unit/newline-test/newline-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/newline-test/target/site/apidocs + ${basedir}/target/test/unit/newline-test/target/site ${basedir}/target/test/unit/newline-test/target/javadoc-bundle-options protected ISO-8859-1 diff --git a/src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml b/src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml index 88a45552..27687885 100644 --- a/src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml +++ b/src/test/resources/unit/optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/optionsumlautencoding-test/target/site/apidocs + ${basedir}/target/test/unit/optionsumlautencoding-test/target/site ${basedir}/target/test/unit/optionsumlautencoding-test/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/pom-test/pom-test-plugin-config.xml b/src/test/resources/unit/pom-test/pom-test-plugin-config.xml index 59277066..6bf56394 100644 --- a/src/test/resources/unit/pom-test/pom-test-plugin-config.xml +++ b/src/test/resources/unit/pom-test/pom-test-plugin-config.xml @@ -40,7 +40,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/pom-test/target/site/apidocs + ${basedir}/target/test/unit/pom-test/target/site ${basedir}/target/test/unit/pom-test/target/javadoc-bundle-options protected ISO-8859-1 diff --git a/src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml b/src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml index 48307907..d1a21ffd 100644 --- a/src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml +++ b/src/test/resources/unit/proxy-test/proxy-test-plugin-config.xml @@ -35,7 +35,7 @@ under the License. - ${basedir}/target/test/unit/proxy-test/target/site/apidocs + ${basedir}/target/test/unit/proxy-test/target/site ${basedir}/target/test/unit/proxy-test/target/javadoc-bundle-options protected ISO-8859-1 diff --git a/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml b/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml index 7e38262c..9a77c5b9 100644 --- a/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml +++ b/src/test/resources/unit/quotedpath'test/quotedpath-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/quotedpath'test/target/site/apidocs + ${basedir}/target/test/unit/quotedpath'test/target/site ${basedir}/target/test/unit/quotedpath'test/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/resources-test/resources-test-plugin-config.xml b/src/test/resources/unit/resources-test/resources-test-plugin-config.xml index f379b7e8..45a5bf83 100644 --- a/src/test/resources/unit/resources-test/resources-test-plugin-config.xml +++ b/src/test/resources/unit/resources-test/resources-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/resources-test/target/site/apidocs + ${basedir}/target/test/unit/resources-test/target/site ${basedir}/target/test/unit/resources-test/target/javadoc-bundle-options Maven Javadoc Plugin resources 1.0-SNAPSHOT API ${basedir}/src/test/resources/unit/resources-test/src/main/javadoc diff --git a/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml b/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml index 4ebfbf1c..042e1ef2 100644 --- a/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml +++ b/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/resources-with-excludes-test/target/site/apidocs + ${basedir}/target/test/unit/resources-with-excludes-test/target/site ${basedir}/target/test/unit/resources-with-excludes-test/target/javadoc-bundle-options Maven Javadoc Plugin resources 1.0-SNAPSHOT API ${basedir}/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc diff --git a/src/test/resources/unit/stale-test/stale-test-plugin-config.xml b/src/test/resources/unit/stale-test/stale-test-plugin-config.xml index 699bc087..756a5d89 100644 --- a/src/test/resources/unit/stale-test/stale-test-plugin-config.xml +++ b/src/test/resources/unit/stale-test/stale-test-plugin-config.xml @@ -40,7 +40,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/stale-test/target/site/apidocs + ${basedir}/target/test/unit/stale-test/target/site ${basedir}/target/test/unit/stale-test/target/javadoc-bundle-options protected ISO-8859-1 diff --git a/src/test/resources/unit/stylesheetfile-test/artifact-stylesheetfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom b/src/test/resources/unit/stylesheetfile-test/artifact-stylesheetfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom index 58c7b985..5a7fdf17 100644 --- a/src/test/resources/unit/stylesheetfile-test/artifact-stylesheetfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom +++ b/src/test/resources/unit/stylesheetfile-test/artifact-stylesheetfile/org/apache/maven/plugins/maven-javadoc-plugin/unit/stylesheetfile-test/1.0-SNAPSHOT/stylesheetfile-test-1.0-SNAPSHOT.pom @@ -35,7 +35,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/stylesheetfile-test/target/site/apidocs + ${basedir}/target/test/unit/stylesheetfile-test/target/site ${basedir}/src/test/resources/unit/stylesheetfile-test/src/main/javadoc false false diff --git a/src/test/resources/unit/stylesheetfile-test/pom.xml b/src/test/resources/unit/stylesheetfile-test/pom.xml index 978e62a2..51e6de9d 100644 --- a/src/test/resources/unit/stylesheetfile-test/pom.xml +++ b/src/test/resources/unit/stylesheetfile-test/pom.xml @@ -35,7 +35,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/stylesheetfile-test/target/site/apidocs + ${basedir}/target/test/unit/stylesheetfile-test/target/site ${basedir}/target/test/unit/stylesheetfile-test/target/javadoc-bundle-options ${basedir}/src/test/resources/unit/stylesheetfile-test/src/main/javadoc false diff --git a/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml b/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml index a6b04676..b8025d3a 100644 --- a/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml +++ b/src/test/resources/unit/subpackages-test/subpackages-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/subpackages-test/target/site/apidocs + ${basedir}/target/test/unit/subpackages-test/target/site ${basedir}/target/test/unit/subpackages-test/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/tag-test/tag-test-plugin-config.xml b/src/test/resources/unit/tag-test/tag-test-plugin-config.xml index eb8b6e5e..6b8f2e8c 100644 --- a/src/test/resources/unit/tag-test/tag-test-plugin-config.xml +++ b/src/test/resources/unit/tag-test/tag-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/tag-test/target/site/apidocs + ${basedir}/target/test/unit/tag-test/target/site ${basedir}/target/test/unit/tag-test/target/javadoc-bundle-options Maven Javadoc Plugin tag 1.0-SNAPSHOT API protected diff --git a/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml b/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml index ef6dbcac..019301b6 100644 --- a/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml +++ b/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/taglet-test/target/site/apidocs + ${basedir}/target/test/unit/taglet-test/target/site ${basedir}/target/test/unit/taglet-test/target/javadoc-bundle-options org.tullmann.taglets.ToDo diff --git a/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml b/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml index 99845e3c..19a5a8ac 100644 --- a/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml +++ b/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/tagletArtifacts-test/target/site/apidocs + ${basedir}/target/test/unit/tagletArtifacts-test/target/site ${basedir}/target/test/unit/tagletArtifacts-test/target/javadoc-bundle-options false false diff --git a/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml b/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml index bf0b5ffa..d82c5a84 100644 --- a/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml +++ b/src/test/resources/unit/test-javadoc-test/test-javadoc-test-plugin-config.xml @@ -40,7 +40,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/test-javadoc-test/target/site/apidocs + ${basedir}/target/test/unit/test-javadoc-test/target/site ${basedir}/target/test/unit/test-javadoc-test/target/javadoc-bundle-options Maven Test Javadoc Plugin aggregate resources 1.0-SNAPSHOT API protected diff --git a/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml index 4999e7d7..e259d848 100644 --- a/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/conflict-options-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/validate-options-test/target/site/apidocs + ${basedir}/target/test/unit/validate-options-test/target/site ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected ISO-8859-1 diff --git a/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml index c65279d5..aa7294e3 100644 --- a/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-charset-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/validate-options-test/target/site/apidocs + ${basedir}/target/test/unit/validate-options-test/target/site ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml index 35e1686c..79e47f17 100644 --- a/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-docencoding-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/validate-options-test/target/site/apidocs + ${basedir}/target/test/unit/validate-options-test/target/site ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml index a484eb85..c06ec840 100644 --- a/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-encoding-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/validate-options-test/target/site/apidocs + ${basedir}/target/test/unit/validate-options-test/target/site ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected diff --git a/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml b/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml index 4ddf68ea..879b0e84 100644 --- a/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml +++ b/src/test/resources/unit/validate-options-test/wrong-locale-with-variant-test-plugin-config.xml @@ -34,7 +34,7 @@ under the License. maven-javadoc-plugin - ${basedir}/target/test/unit/validate-options-test/target/site/apidocs + ${basedir}/target/test/unit/validate-options-test/target/site ${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options protected