diff --git a/pom.xml b/pom.xml index 57425857c..150a1004f 100644 --- a/pom.xml +++ b/pom.xml @@ -202,6 +202,13 @@ under the License. maven-reporting-api 4.0.0-M12 + + + org.apache.maven.reporting + maven-reporting-impl + 4.0.0-M15 + provided + org.apache.maven maven-archiver diff --git a/src/it/projects/MJAVADOC-110/verify.bsh b/src/it/projects/MJAVADOC-110/verify.bsh index 7f18bc073..547fb2bb8 100644 --- a/src/it/projects/MJAVADOC-110/verify.bsh +++ b/src/it/projects/MJAVADOC-110/verify.bsh @@ -1,54 +1,54 @@ - -/* - * 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.*; - -boolean result = true; - -try -{ - File target = new File( basedir, "target" ); - if ( !target.exists() || !target.isDirectory() ) - { - System.err.println( "target file is missing or a directory." ); - return false; - } - - File apidocs = new File( target, "site/apidocs" ); - if ( !apidocs.exists() || !apidocs.isDirectory() ) - { - System.err.println( "target/site/apidocs file is missing or a directory." ); - return false; - } - - File htmlFile = new File( apidocs, "Test.html" ); - if ( !htmlFile.isFile() ) - { - System.err.println( "target/site/apidocs/Test.html file is missing or a a file." ); - return false; - } -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; + +/* + * 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.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or a directory." ); + return false; + } + + File apidocs = new File( target, "reports/apidocs" ); + if ( !apidocs.exists() || !apidocs.isDirectory() ) + { + System.err.println( "target/reports/apidocs file is missing or a directory." ); + return false; + } + + File htmlFile = new File( apidocs, "Test.html" ); + if ( !htmlFile.isFile() ) + { + System.err.println( "target/reports/apidocs/Test.html file is missing or a a file." ); + return false; + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-126/verify.bsh b/src/it/projects/MJAVADOC-126/verify.bsh index 2b94b5820..da4e155bb 100644 --- a/src/it/projects/MJAVADOC-126/verify.bsh +++ b/src/it/projects/MJAVADOC-126/verify.bsh @@ -1,58 +1,58 @@ - -/* - * 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 target = new File( basedir, "test/target" ); -if ( !target.isDirectory() ) -{ - System.err.println( "target is missing or not a directory." ); - return false; -} - -File apidocs = new File( basedir, "test/target/site/apidocs" ); -if ( !apidocs.isDirectory() ) -{ - System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." ); - return false; -} - -File file1 = new File( apidocs, "file1.txt" ); -if ( !file1.isFile() ) -{ - System.err.println( file1.getAbsolutePath() + " is missing or a directory." ); - return false; -} - -File file2 = new File( apidocs, "file2.txt" ); -if ( !file2.isFile() ) -{ - System.err.println( file2.getAbsolutePath() + " is missing or a directory." ); - return false; -} - -File metainf = new File( apidocs, "META-INF" ); -if ( metainf.isDirectory() ) -{ - System.err.println( metainf.getAbsolutePath() + " exists." ); - 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 target = new File( basedir, "test/target" ); +if ( !target.isDirectory() ) +{ + System.err.println( "target is missing or not a directory." ); + return false; +} + +File apidocs = new File( basedir, "test/target/reports/apidocs" ); +if ( !apidocs.isDirectory() ) +{ + System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." ); + return false; +} + +File file1 = new File( apidocs, "file1.txt" ); +if ( !file1.isFile() ) +{ + System.err.println( file1.getAbsolutePath() + " is missing or a directory." ); + return false; +} + +File file2 = new File( apidocs, "file2.txt" ); +if ( !file2.isFile() ) +{ + System.err.println( file2.getAbsolutePath() + " is missing or a directory." ); + return false; +} + +File metainf = new File( apidocs, "META-INF" ); +if ( metainf.isDirectory() ) +{ + System.err.println( metainf.getAbsolutePath() + " exists." ); + return false; +} + +return true; diff --git a/src/it/projects/MJAVADOC-172/verify.bsh b/src/it/projects/MJAVADOC-172/verify.bsh index 0995c58ec..7d82745d6 100644 --- a/src/it/projects/MJAVADOC-172/verify.bsh +++ b/src/it/projects/MJAVADOC-172/verify.bsh @@ -1,63 +1,63 @@ - -/* - * 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.*; -import org.codehaus.plexus.util.*; - -boolean result = true; - -try -{ - File target = new File( basedir, "target" ); - if ( !target.exists() || !target.isDirectory() ) - { - System.err.println( "target file is missing or a directory." ); - return false; - } - - File apidocs = new File( basedir, "target/site/apidocs" ); - if ( !apidocs.exists() || !apidocs.isDirectory() ) - { - System.err.println( "target/site/apidocs file is missing or a directory." ); - return false; - } - - File options = new File( apidocs, "options" ); - if ( !options.exists() || !options.isFile() ) - { - System.err.println( "target/site/apidocs/options file is missing or not a file." ); - return false; - } - - String str = FileUtils.fileRead( options ); - - if ( !str.contains( "junit-4.13.1.jar" ) ) - { - System.err.println( "Javadoc doesn't used correct artifacts." ); - return false; - } -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; + +/* + * 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.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or a directory." ); + return false; + } + + File apidocs = new File( basedir, "target/reports/apidocs" ); + if ( !apidocs.exists() || !apidocs.isDirectory() ) + { + System.err.println( "target/reports/apidocs file is missing or a directory." ); + return false; + } + + File options = new File( apidocs, "options" ); + if ( !options.exists() || !options.isFile() ) + { + System.err.println( "target/reports/apidocs/options file is missing or not a file." ); + return false; + } + + String str = FileUtils.fileRead( options ); + + if ( !str.contains( "junit-4.13.1.jar" ) ) + { + System.err.println( "Javadoc doesn't used correct artifacts." ); + return false; + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-180/verify.bsh b/src/it/projects/MJAVADOC-180/verify.bsh index db279577f..325e21be5 100644 --- a/src/it/projects/MJAVADOC-180/verify.bsh +++ b/src/it/projects/MJAVADOC-180/verify.bsh @@ -1,61 +1,61 @@ - -/* - * 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.*; - -boolean result = true; - -try -{ - File target = new File( basedir, "target" ); - if ( !target.exists() || !target.isDirectory() ) - { - System.err.println( "target file is missing or a directory." ); - return false; - } - - File testapidocs = new File( basedir, "target/site/testapidocs" ); - if ( !testapidocs.exists() || !testapidocs.isDirectory() ) - { - System.err.println( "target/site/testapidocs file is missing or a directory." ); - return false; - } - - File options = new File( testapidocs, "options" ); - if ( !options.exists() || !options.isFile() ) - { - System.err.println( "target/site/testapidocs/options file is missing or not a file." ); - return false; - } - - File index = new File( testapidocs, "index.html" ); - if ( !index.exists() || !index.isFile() ) - { - System.err.println( "target/site/testapidocs/index.html file is missing or not a file." ); - return false; - } -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; + +/* + * 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.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or a directory." ); + return false; + } + + File testapidocs = new File( basedir, "target/reports/testapidocs" ); + if ( !testapidocs.exists() || !testapidocs.isDirectory() ) + { + System.err.println( "target/reports/testapidocs file is missing or a directory." ); + return false; + } + + File options = new File( testapidocs, "options" ); + if ( !options.exists() || !options.isFile() ) + { + System.err.println( "target/reports/testapidocs/options file is missing or not a file." ); + return false; + } + + File index = new File( testapidocs, "index.html" ); + if ( !index.exists() || !index.isFile() ) + { + System.err.println( "target/reports/testapidocs/index.html file is missing or not a file." ); + return false; + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-181/verify.bsh b/src/it/projects/MJAVADOC-181/verify.bsh index c0437510d..e325acdfb 100644 --- a/src/it/projects/MJAVADOC-181/verify.bsh +++ b/src/it/projects/MJAVADOC-181/verify.bsh @@ -1,67 +1,67 @@ - -/* - * 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.*; - -boolean result = true; - -try -{ - // Generated files checks - File apidocs = new File( basedir, "application/target/site/apidocs" ); - if ( !apidocs.isDirectory() ) - { - System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - apidocs = new File( basedir, "library/module-a/target/site/apidocs" ); - if ( !apidocs.isDirectory() ) - { - System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - apidocs = new File( basedir, "library/module-b/target/site/apidocs" ); - if ( !apidocs.isDirectory() ) - { - System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - - // Not existing files - apidocs = new File( basedir, "target/site/apidocs" ); - if ( apidocs.exists() ) - { - System.err.println( apidocs.getAbsolutePath() + " has been generated." ); - return false; - } - apidocs = new File( basedir, "library/target/site/apidocs" ); - if ( apidocs.exists() ) - { - System.err.println( apidocs.getAbsolutePath() + " has been generated." ); - return false; - } -} -catch( RuntimeException e ) -{ - e.printStackTrace(); - return false; -} - -return result; + +/* + * 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.*; + +boolean result = true; + +try +{ + // Generated files checks + File apidocs = new File( basedir, "application/target/reports/apidocs" ); + if ( !apidocs.isDirectory() ) + { + System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + apidocs = new File( basedir, "library/module-a/target/reports/apidocs" ); + if ( !apidocs.isDirectory() ) + { + System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + apidocs = new File( basedir, "library/module-b/target/reports/apidocs" ); + if ( !apidocs.isDirectory() ) + { + System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + + // Not existing files + apidocs = new File( basedir, "target/reports/apidocs" ); + if ( apidocs.exists() ) + { + System.err.println( apidocs.getAbsolutePath() + " has been generated." ); + return false; + } + apidocs = new File( basedir, "library/target/reports/apidocs" ); + if ( apidocs.exists() ) + { + System.err.println( apidocs.getAbsolutePath() + " has been generated." ); + return false; + } +} +catch( RuntimeException e ) +{ + e.printStackTrace(); + return false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-194/verify.bsh b/src/it/projects/MJAVADOC-194/verify.bsh index d9911d061..655e1cfc7 100644 --- a/src/it/projects/MJAVADOC-194/verify.bsh +++ b/src/it/projects/MJAVADOC-194/verify.bsh @@ -1,82 +1,82 @@ - -/* - * 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.*; - -boolean result = true; - -try -{ - File target = new File( basedir, "target" ); - if ( !target.exists() || !target.isDirectory() ) - { - System.err.println( "target file is missing or a directory." ); - return false; - } - - File apidocs = new File( basedir, "target/site/apidocs" ); - if ( !apidocs.exists() || !apidocs.isDirectory() ) - { - System.err.println( "target/site/apidocs file is missing or a directory." ); - return false; - } - - File index = new File( apidocs, "index.html" ); - if ( !index.exists() || !index.isFile() ) - { - System.err.println( "target/site/apidocs/index.html file is missing or not a file." ); - return false; - } - - File test1 = new File( apidocs, "test/Test1.html" ); - if ( !test1.exists() || !test1.isFile() ) - { - System.err.println( "target/site/apidocs/test/Test1.html file is missing or not a file." ); - return false; - } - - File test2 = new File( apidocs, "test/Test2.html" ); - if ( !test2.exists() || !test2.isFile() ) - { - System.err.println( "target/site/apidocs/test/Test2.html file is missing or not a file." ); - return false; - } - - File generatedTest1 = new File( apidocs, "test/GeneratedTest1.html" ); - if ( !generatedTest1.exists() || !generatedTest1.isFile() ) - { - System.err.println( "target/site/apidocs/test/GeneratedTest1.html file is missing or not a file." ); - return false; - } - - File generatedTest2 = new File( apidocs, "test/GeneratedTest2.html" ); - if ( !generatedTest2.exists() || !generatedTest2.isFile() ) - { - System.err.println( "target/site/apidocs/test/GeneratedTest2.html file is missing or not a file." ); - return false; - } -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; + +/* + * 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.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or a directory." ); + return false; + } + + File apidocs = new File( basedir, "target/reports/apidocs" ); + if ( !apidocs.exists() || !apidocs.isDirectory() ) + { + System.err.println( "target/reports/apidocs file is missing or a directory." ); + return false; + } + + File index = new File( apidocs, "index.html" ); + if ( !index.exists() || !index.isFile() ) + { + System.err.println( "target/reports/apidocs/index.html file is missing or not a file." ); + return false; + } + + File test1 = new File( apidocs, "test/Test1.html" ); + if ( !test1.exists() || !test1.isFile() ) + { + System.err.println( "target/reports/apidocs/test/Test1.html file is missing or not a file." ); + return false; + } + + File test2 = new File( apidocs, "test/Test2.html" ); + if ( !test2.exists() || !test2.isFile() ) + { + System.err.println( "target/reports/apidocs/test/Test2.html file is missing or not a file." ); + return false; + } + + File generatedTest1 = new File( apidocs, "test/GeneratedTest1.html" ); + if ( !generatedTest1.exists() || !generatedTest1.isFile() ) + { + System.err.println( "target/reports/apidocs/test/GeneratedTest1.html file is missing or not a file." ); + return false; + } + + File generatedTest2 = new File( apidocs, "test/GeneratedTest2.html" ); + if ( !generatedTest2.exists() || !generatedTest2.isFile() ) + { + System.err.println( "target/reports/apidocs/test/GeneratedTest2.html file is missing or not a file." ); + return false; + } +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-262/verify.bsh b/src/it/projects/MJAVADOC-262/verify.bsh index 8cb556c11..ef46108db 100644 --- a/src/it/projects/MJAVADOC-262/verify.bsh +++ b/src/it/projects/MJAVADOC-262/verify.bsh @@ -1,41 +1,41 @@ - -/* - * 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.*; - -boolean result = true; - -try -{ - // Generated files checks - File apidocs = new File( basedir, "target/site/apidocs" ); - if ( !apidocs.isDirectory() ) - { - System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } -} -catch( RuntimeException e ) -{ - e.printStackTrace(); - return false; -} - -return result; + +/* + * 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.*; + +boolean result = true; + +try +{ + // Generated files checks + File apidocs = new File( basedir, "target/reports/apidocs" ); + if ( !apidocs.isDirectory() ) + { + System.err.println( apidocs.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } +} +catch( RuntimeException e ) +{ + e.printStackTrace(); + return false; +} + +return result; diff --git a/src/it/projects/MJAVADOC-278/verify.bsh b/src/it/projects/MJAVADOC-278/verify.bsh index b86a5d6fd..0f30f40a0 100644 --- a/src/it/projects/MJAVADOC-278/verify.bsh +++ b/src/it/projects/MJAVADOC-278/verify.bsh @@ -1,32 +1,32 @@ - -/* - * 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.*; -import org.codehaus.plexus.util.*; - -File exampleResourceFile = new File( basedir, "target/site/apidocs/resources/bg.psd" ); - -if ( !exampleResourceFile.exists() ) -{ - System.err.println( exampleResourceFile.getAbsolutePath() + " is missing." ); - return false; -} - + +/* + * 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.*; +import org.codehaus.plexus.util.*; + +File exampleResourceFile = new File( basedir, "target/reports/apidocs/resources/bg.psd" ); + +if ( !exampleResourceFile.exists() ) +{ + System.err.println( exampleResourceFile.getAbsolutePath() + " is missing." ); + return false; +} + return true; \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-320/verify.groovy b/src/it/projects/MJAVADOC-320/verify.groovy index d9375a346..b29f53f7d 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, "reports/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-365/verify.bsh b/src/it/projects/MJAVADOC-365/verify.bsh index e159e69a3..3b17f49bd 100644 --- a/src/it/projects/MJAVADOC-365/verify.bsh +++ b/src/it/projects/MJAVADOC-365/verify.bsh @@ -21,8 +21,8 @@ import java.io.*; import org.codehaus.plexus.util.*; -File includedFile = new File( basedir, "target/site/apidocs/foo/Included.html" ); -File excludedFile = new File( basedir, "target/site/apidocs/foo/Excluded.html" ); +File includedFile = new File( basedir, "target/reports/apidocs/foo/Included.html" ); +File excludedFile = new File( basedir, "target/reports/apidocs/foo/Excluded.html" ); if ( !includedFile.exists() ) { diff --git a/src/it/projects/MJAVADOC-384/verify.bsh b/src/it/projects/MJAVADOC-384/verify.bsh index 1c80f44a2..b402f9330 100644 --- a/src/it/projects/MJAVADOC-384/verify.bsh +++ b/src/it/projects/MJAVADOC-384/verify.bsh @@ -1,54 +1,54 @@ - -/* - * 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.*; -import org.codehaus.plexus.util.*; - -File[] nonExistingJavadocFiles = new File[] { - new File( basedir, "target/site/apidocs/com/foo/bar/impl/NotApi.html" ), - new File( basedir, "target/site/apidocs/com/foo/bar/internal/NotApi.html" ), - new File( basedir, "target/site/apidocs/com/foo/bar/internal/other/NotApi.html" ), -}; - -for ( File javadocFile : nonExistingJavadocFiles ) -{ - if ( javadocFile.exists() ) - { - System.err.println( javadocFile.getAbsolutePath() + " is present." ); - return false; - } -} - -File[] existingJavadocFiles = new File[] { - new File( basedir, "target/site/apidocs/com/foo/bar/Api.html" ), - new File( basedir, "target/site/apidocs/com/foo/bar/internal/Api.html" ), -}; - -for ( File javadocFile : existingJavadocFiles ) -{ - if ( !javadocFile.exists() ) - { - System.err.println( javadocFile.getAbsolutePath() + " is missing." ); - 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.*; +import org.codehaus.plexus.util.*; + +File[] nonExistingJavadocFiles = new File[] { + new File( basedir, "target/reports/apidocs/com/foo/bar/impl/NotApi.html" ), + new File( basedir, "target/reports/apidocs/com/foo/bar/internal/NotApi.html" ), + new File( basedir, "target/reports/apidocs/com/foo/bar/internal/other/NotApi.html" ), +}; + +for ( File javadocFile : nonExistingJavadocFiles ) +{ + if ( javadocFile.exists() ) + { + System.err.println( javadocFile.getAbsolutePath() + " is present." ); + return false; + } +} + +File[] existingJavadocFiles = new File[] { + new File( basedir, "target/reports/apidocs/com/foo/bar/Api.html" ), + new File( basedir, "target/reports/apidocs/com/foo/bar/internal/Api.html" ), +}; + +for ( File javadocFile : existingJavadocFiles ) +{ + if ( !javadocFile.exists() ) + { + System.err.println( javadocFile.getAbsolutePath() + " is missing." ); + return false; + } +} + + +return true; diff --git a/src/it/projects/MJAVADOC-407/verify.bsh b/src/it/projects/MJAVADOC-407/verify.bsh index d6a654393..46a7d3dae 100644 --- a/src/it/projects/MJAVADOC-407/verify.bsh +++ b/src/it/projects/MJAVADOC-407/verify.bsh @@ -1,32 +1,32 @@ - -/* - * 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.*; -import org.codehaus.plexus.util.*; - -File javadocFile = new File( basedir, "target/site/apidocs/foo/Bar.html" ); - -if ( !javadocFile.exists() ) -{ - System.err.println( javadocFile.getAbsolutePath() + " is missing." ); - return false; -} - + +/* + * 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.*; +import org.codehaus.plexus.util.*; + +File javadocFile = new File( basedir, "target/reports/apidocs/foo/Bar.html" ); + +if ( !javadocFile.exists() ) +{ + System.err.println( javadocFile.getAbsolutePath() + " is missing." ); + return false; +} + return true; \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-414/verify.bsh b/src/it/projects/MJAVADOC-414/verify.bsh index 0a9d3092f..cf9faed63 100644 --- a/src/it/projects/MJAVADOC-414/verify.bsh +++ b/src/it/projects/MJAVADOC-414/verify.bsh @@ -1,47 +1,47 @@ - -/* - * 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.*; -import org.codehaus.plexus.util.*; - -File indexFile = new File( basedir, "target/site/testapidocs/mjavadoc414/test/AppTest.html" ); - -if ( !indexFile.exists() ) -{ - System.err.println( indexFile.getAbsolutePath() + " is missing." ); - return false; -} - -File buildLog = new File( basedir, "build.log" ); -String content = IOUtil.toString( new FileInputStream( buildLog ) ); -String importError = "error: cannot find symbol"; -if ( content.contains( importError ) ) -{ - System.err.println( "build.log contains '" + importError + "'" ); - return false; -} - -String referenceWarning = "Tag @link: reference not found: mjavadoc414.App"; -if ( content.contains( referenceWarning ) ) -{ - System.err.println( "build.log contains '" + referenceWarning + "'" ); - 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.*; +import org.codehaus.plexus.util.*; + +File indexFile = new File( basedir, "target/reports/testapidocs/mjavadoc414/test/AppTest.html" ); + +if ( !indexFile.exists() ) +{ + System.err.println( indexFile.getAbsolutePath() + " is missing." ); + return false; +} + +File buildLog = new File( basedir, "build.log" ); +String content = IOUtil.toString( new FileInputStream( buildLog ) ); +String importError = "error: cannot find symbol"; +if ( content.contains( importError ) ) +{ + System.err.println( "build.log contains '" + importError + "'" ); + return false; +} + +String referenceWarning = "Tag @link: reference not found: mjavadoc414.App"; +if ( content.contains( referenceWarning ) ) +{ + System.err.println( "build.log contains '" + referenceWarning + "'" ); + return false; +} +return true; diff --git a/src/it/projects/MJAVADOC-427/verify.groovy b/src/it/projects/MJAVADOC-427/verify.groovy index f3ad4b044..8f4785671 100644 --- a/src/it/projects/MJAVADOC-427/verify.groovy +++ b/src/it/projects/MJAVADOC-427/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -def file = new File( basedir, 'target/site/apidocs/mjavadoc427/App.html' ); +def file = new File( basedir, 'target/reports/apidocs/mjavadoc427/App.html' ); assert file.exists() diff --git a/src/it/projects/MJAVADOC-437/verify.bsh b/src/it/projects/MJAVADOC-437/verify.bsh index 0507b02e3..1e7e4fd30 100644 --- a/src/it/projects/MJAVADOC-437/verify.bsh +++ b/src/it/projects/MJAVADOC-437/verify.bsh @@ -35,7 +35,7 @@ boolean result = true; try { - File javadoc = new File( basedir, "target/site/apidocs/com/example/bar/Bar.html" ); + File javadoc = new File( basedir, "target/reports/apidocs/com/example/bar/Bar.html" ); if ( !javadoc.exists() ) { System.err.println( javadoc + " is missing" ); diff --git a/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy b/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy index 28fdb1f6b..0b179c4f5 100644 --- a/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy +++ b/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy @@ -19,20 +19,20 @@ int javaVersion = System.getProperty( "java.specification.version" ) as Integer if ( javaVersion >= 11 ) { - def index = new File( basedir, 'target/site/apidocs/index.html') + def index = new File( basedir, 'target/reports/apidocs/index.html') assert index.text =~ /modulea<\/a>/ assert index.text =~ /moduleb<\/a>/ - assert new File( basedir, 'target/site/apidocs/modulea/module-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/moduleb/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/modulea/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/moduleb/module-summary.html').exists() } else { - def overview = new File( basedir, 'target/site/apidocs/overview-summary.html') + def overview = new File( basedir, 'target/reports/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/reports/apidocs/modulea-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/moduleb-summary.html').exists() } diff --git a/src/it/projects/MJAVADOC-450_classifier/verify.groovy b/src/it/projects/MJAVADOC-450_classifier/verify.groovy index ac751d0fe..d07b2be3e 100644 --- a/src/it/projects/MJAVADOC-450_classifier/verify.groovy +++ b/src/it/projects/MJAVADOC-450_classifier/verify.groovy @@ -20,5 +20,5 @@ def buildLog = new File( basedir, 'build.log' ); assert buildLog.text.contains('[DEBUG] custom.css found in javadoc plugin dependencies.') -def stylesheetCss = new File( basedir, 'target/site/apidocs/stylesheet.css' ); +def stylesheetCss = new File( basedir, 'target/reports/apidocs/stylesheet.css' ); assert stylesheetCss.text.contains('/* CUSTOM CSS */') diff --git a/src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy b/src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy index ce90596e8..75a25f10c 100644 --- a/src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy +++ b/src/it/projects/MJAVADOC-495_offline-filescheme/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -assert new File( basedir, 'target/site/apidocs/options').readLines() +assert new File( basedir, 'target/reports/apidocs/options').readLines() .dropWhile{ it != '-link'} .drop(1) .first() diff --git a/src/it/projects/MJAVADOC-497/verify.bsh b/src/it/projects/MJAVADOC-497/verify.bsh index d90f357f6..8aa8285f5 100644 --- a/src/it/projects/MJAVADOC-497/verify.bsh +++ b/src/it/projects/MJAVADOC-497/verify.bsh @@ -1,58 +1,58 @@ -/* - * 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.*; - -try -{ - File list; - - String javaVersion = System.getProperty( "java.specification.version" ); - if ( javaVersion.startsWith( "1." ) || javaVersion.equals( "9" ) ) - { - list = new File( basedir, "target/site/apidocs/package-list" ); - } - else - { - list = new File( basedir, "target/site/apidocs/element-list" ); - } - - if ( !list.exists() ) - { - System.err.println( packageList + " is missing" ); - return false; - } - - FileReader fr = new FileReader( list ); - BufferedReader br = new BufferedReader( fr ); - String line = br.readLine(); - if ( !"com.example.foo".equals( line ) || br.readLine() != null ) - { - System.err.println( "package com.example.foo is not the only entry in the package-list" ); - return false; - } - br.close(); -} -catch ( Exception e ) -{ - e.printStackTrace(); - return false; -} - +/* + * 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.*; + +try +{ + File list; + + String javaVersion = System.getProperty( "java.specification.version" ); + if ( javaVersion.startsWith( "1." ) || javaVersion.equals( "9" ) ) + { + list = new File( basedir, "target/reports/apidocs/package-list" ); + } + else + { + list = new File( basedir, "target/reports/apidocs/element-list" ); + } + + if ( !list.exists() ) + { + System.err.println( packageList + " is missing" ); + return false; + } + + FileReader fr = new FileReader( list ); + BufferedReader br = new BufferedReader( fr ); + String line = br.readLine(); + if ( !"com.example.foo".equals( line ) || br.readLine() != null ) + { + System.err.println( "package com.example.foo is not the only entry in the package-list" ); + return false; + } + br.close(); +} +catch ( Exception e ) +{ + e.printStackTrace(); + return false; +} + return true; \ No newline at end of file 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 3a870ed3a..99777a19e 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/reports/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/reports/apidocs/M.N/com/foo/MyClass.html').exists() +} diff --git a/src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy b/src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy index e75b96cf0..b0fc0b743 100644 --- a/src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy +++ b/src/it/projects/MJAVADOC-555_aggr_mixed/verify.groovy @@ -19,20 +19,20 @@ int javaVersion = System.getProperty( "java.specification.version" ) as Integer if ( javaVersion >= 11 ) { - def index = new File( basedir, 'target/site/apidocs/index.html') + def index = new File( basedir, 'target/reports/apidocs/index.html') assert index.text =~ /module1<\/a>/ assert index.text =~ /module2<\/a>/ - assert new File( basedir, 'target/site/apidocs/module1/module-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/module2/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/module1/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/module2/module-summary.html').exists() } else { - def overview = new File( basedir, 'target/site/apidocs/overview-summary.html') + def overview = new File( basedir, 'target/reports/apidocs/overview-summary.html') assert overview.text =~ /module1<\/a>/ assert overview.text =~ /module2<\/a>/ - assert new File( basedir, 'target/site/apidocs/module1-summary.html').exists() - assert new File( basedir, 'target/site/apidocs/module2-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/module1-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/module2-summary.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 ad6c4621e..693813e3a 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/reports/apidocs/jul_to_slf4j/com/testcase/Testcase.html') } else { - classFile = new File( basedir, 'target/apidocs/com/testcase/Testcase.html') + classFile = new File( basedir, 'target/reports/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 a38349a0d..7929159e7 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/reports/apidocs/com/foo/MyClass.html').exists() diff --git a/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy b/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy index 6fa229a5b..f63075b99 100644 --- a/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy +++ b/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy @@ -26,6 +26,6 @@ if ( javaVersion.startsWith('1.') || Integer.parseInt(javaVersion) < 16 ) } else { - def barHtml = new File(basedir,'target/site/apidocs/foo/Bar.html') + def barHtml = new File(basedir,'target/reports/apidocs/foo/Bar.html') assert barHtml.text =~ /= 11 ) { - def index = new File( basedir, 'target/apidocs/index.html') + def index = new File( basedir, 'target/reports/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/reports/apidocs/modulea/module-summary.html').exists() + assert new File( basedir, 'target/reports/apidocs/moduleb/module-summary.html').exists() +} else { - def overview = new File( basedir, 'target/site/apidocs/overview-summary.html') + def overview = new File( basedir, 'target/reports/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-661_mrjar/verify.groovy b/src/it/projects/MJAVADOC-661_mrjar/verify.groovy index 817ea3de0..4906364af 100644 --- a/src/it/projects/MJAVADOC-661_mrjar/verify.groovy +++ b/src/it/projects/MJAVADOC-661_mrjar/verify.groovy @@ -23,7 +23,7 @@ def required = [] versions.each { required << "'com.foo.Taglet" + it + "'" } -def options = new File( basedir, 'target/site/apidocs/options' ); +def options = new File( basedir, 'target/reports/apidocs/options' ); assert options.exists() : options + " not found" diff --git a/src/it/projects/MJAVADOC-770/verify.groovy b/src/it/projects/MJAVADOC-770/verify.groovy index 165abb147..86ea1df5a 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/reports/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 af443a824..c276427ae 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/reports" ); +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 e5b9af41d..b5d554731 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/reports" ); +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 4266397b3..3320b79b4 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/reports" ); +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 4216b3e24..11a216d26 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/reports" ); +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/detectLinks/verify.bsh b/src/it/projects/detectLinks/verify.bsh index 145ebb417..58802196f 100644 --- a/src/it/projects/detectLinks/verify.bsh +++ b/src/it/projects/detectLinks/verify.bsh @@ -1,139 +1,139 @@ - -/* - * 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.*; -import org.codehaus.plexus.util.*; - -boolean result = true; - -try -{ - // Generated files checks - File apidocs1 = new File( basedir, "module1/target/site/apidocs" ); - if ( !apidocs1.exists() || !apidocs1.isDirectory() ) - { - System.err.println( apidocs1.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - File apidocs2 = new File( basedir, "module2/target/site/apidocs" ); - if ( !apidocs2.exists() || !apidocs2.isDirectory() ) - { - System.err.println( apidocs2.getAbsolutePath() + " dir is missing or a directory." ); - return false; - } - - File options1 = new File( apidocs1, "options" ); - if ( !options1.exists() || !options1.isFile() ) - { - System.err.println( options1.getAbsolutePath() + " file is missing or not a file." ); - return false; - } - File options2 = new File( apidocs2, "options" ); - if ( !options2.exists() || !options2.isFile() ) - { - System.err.println( options2.getAbsolutePath() + " file is missing or not a file." ); - return false; - } - - // Read files - String contentOptions1 = FileUtils.fileRead( options1 ); - String contentOptions2 = FileUtils.fileRead( options2 ); - String log = FileUtils.fileRead( new File( basedir, "build.log" ) ); - - // Generated files content checks - if ( contentOptions1.contains( "module2" ) ) - { // module1 does not depend on module2, then it should not link - System.err.println( "module1 -linkoffline module2 added: " + options1 ); - return false; - } - int link1 = contentOptions1.indexOf( "-link" ); - if ( link1 == -1 ) - { - System.err.println( "-link not added: " + options1 ); - return false; - } - if ( !contentOptions1.substring( link1 ).contains( "commons.apache.org" ) ) - { - System.err.println( "link for commons-lang not added: " + options1 ); - if ( !log.contains( "Error fetching link: http://commons.apache.org/lang/apidocs" ) ) - { - return false; - } - } - if ( !contentOptions1.substring( link1 ).contains( "junit.org" ) ) - { - System.err.println( "link for junit not added: " + options1 ); - if ( !log.contains( "Error fetching link: http://junit.org/apidocs" ) ) - { - return false; - } - } - if ( contentOptions1.contains( "http://maven.apache.org/maven2/maven-script/maven-script-marmalade/apidocs" ) ) - { - System.err.println( "link for maven-script-marmalade added: " + options1 ); - return false; - } - - int linkoffline2 = contentOptions2.indexOf( "module1" ); - if ( linkoffline2 < 0 ) - { // module2 depends on module1, then it should link - System.err.println( "module2 -linkoffline module1 not added: " + options2 ); - return false; - } - if ( !contentOptions2.substring( linkoffline2 ).contains( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) ) ) - { - System.err.println( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) + " not added: " + options2 ); - return false; - } - int link2 = contentOptions2.indexOf( "-link" ); - if ( link2 == -1 ) - { - System.err.println( "-link not added: " + options2 ); - return false; - } - if ( !contentOptions2.substring( link2 ).contains( "commons.apache.org" ) ) - { - System.err.println( "link for commons-lang not added: " + options2 ); - if ( !log.contains( "Error fetching link: http://commons.apache.org/lang/apidocs" ) ) - { - return false; - } - } - if ( !contentOptions2.substring( link2 ).contains( "junit.org" ) ) - { - System.err.println( "link for junit not added: " + options2 ); - if ( !log.contains( "Error fetching link: http://junit.org/apidocs" ) ) - { - return false; - } - } - if ( contentOptions2.contains( "http://maven.apache.org/maven2/maven-script/maven-script-marmalade/apidocs" ) ) - { - System.err.println( "link for maven-script-marmalade added: " + options2 ); - return false; - } -} -catch( RuntimeException e ) -{ - e.printStackTrace(); - return false; -} - -return result; + +/* + * 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.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + // Generated files checks + File apidocs1 = new File( basedir, "module1/target/reports/apidocs" ); + if ( !apidocs1.exists() || !apidocs1.isDirectory() ) + { + System.err.println( apidocs1.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + File apidocs2 = new File( basedir, "module2/target/reports/apidocs" ); + if ( !apidocs2.exists() || !apidocs2.isDirectory() ) + { + System.err.println( apidocs2.getAbsolutePath() + " dir is missing or a directory." ); + return false; + } + + File options1 = new File( apidocs1, "options" ); + if ( !options1.exists() || !options1.isFile() ) + { + System.err.println( options1.getAbsolutePath() + " file is missing or not a file." ); + return false; + } + File options2 = new File( apidocs2, "options" ); + if ( !options2.exists() || !options2.isFile() ) + { + System.err.println( options2.getAbsolutePath() + " file is missing or not a file." ); + return false; + } + + // Read files + String contentOptions1 = FileUtils.fileRead( options1 ); + String contentOptions2 = FileUtils.fileRead( options2 ); + String log = FileUtils.fileRead( new File( basedir, "build.log" ) ); + + // Generated files content checks + if ( contentOptions1.contains( "module2" ) ) + { // module1 does not depend on module2, then it should not link + System.err.println( "module1 -linkoffline module2 added: " + options1 ); + return false; + } + int link1 = contentOptions1.indexOf( "-link" ); + if ( link1 == -1 ) + { + System.err.println( "-link not added: " + options1 ); + return false; + } + if ( !contentOptions1.substring( link1 ).contains( "commons.apache.org" ) ) + { + System.err.println( "link for commons-lang not added: " + options1 ); + if ( !log.contains( "Error fetching link: http://commons.apache.org/lang/apidocs" ) ) + { + return false; + } + } + if ( !contentOptions1.substring( link1 ).contains( "junit.org" ) ) + { + System.err.println( "link for junit not added: " + options1 ); + if ( !log.contains( "Error fetching link: http://junit.org/apidocs" ) ) + { + return false; + } + } + if ( contentOptions1.contains( "http://maven.apache.org/maven2/maven-script/maven-script-marmalade/apidocs" ) ) + { + System.err.println( "link for maven-script-marmalade added: " + options1 ); + return false; + } + + int linkoffline2 = contentOptions2.indexOf( "module1" ); + if ( linkoffline2 < 0 ) + { // module2 depends on module1, then it should link + System.err.println( "module2 -linkoffline module1 not added: " + options2 ); + return false; + } + if ( !contentOptions2.substring( linkoffline2 ).contains( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) ) ) + { + System.err.println( apidocs1.getCanonicalPath().replaceAll( "\\\\", "/" ) + " not added: " + options2 ); + return false; + } + int link2 = contentOptions2.indexOf( "-link" ); + if ( link2 == -1 ) + { + System.err.println( "-link not added: " + options2 ); + return false; + } + if ( !contentOptions2.substring( link2 ).contains( "commons.apache.org" ) ) + { + System.err.println( "link for commons-lang not added: " + options2 ); + if ( !log.contains( "Error fetching link: http://commons.apache.org/lang/apidocs" ) ) + { + return false; + } + } + if ( !contentOptions2.substring( link2 ).contains( "junit.org" ) ) + { + System.err.println( "link for junit not added: " + options2 ); + if ( !log.contains( "Error fetching link: http://junit.org/apidocs" ) ) + { + return false; + } + } + if ( contentOptions2.contains( "http://maven.apache.org/maven2/maven-script/maven-script-marmalade/apidocs" ) ) + { + System.err.println( "link for maven-script-marmalade added: " + options2 ); + return false; + } +} +catch( RuntimeException e ) +{ + e.printStackTrace(); + return false; +} + +return result; diff --git a/src/it/projects/examples/alternate-doclet/verify.groovy b/src/it/projects/examples/alternate-doclet/verify.groovy index c16fc76ac..14a8ac49e 100644 --- a/src/it/projects/examples/alternate-doclet/verify.groovy +++ b/src/it/projects/examples/alternate-doclet/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -File options = new File( basedir, 'target/site/apidocs/options' ) +File options = new File( basedir, 'target/reports/apidocs/options' ) assert options.text.readLines().dropWhile{it != '-doclet'}.get(1) == "'org.umlgraph.doclet.UmlGraphDoc'" assert options.text.readLines().dropWhile{it != '-docletpath'}.get(1).contains('org/umlgraph/umlgraph/5.6.6/umlgraph-5.6.6.jar') diff --git a/src/it/projects/examples/exclude-package-names/verify.groovy b/src/it/projects/examples/exclude-package-names/verify.groovy index 42f0db063..fe0ff693b 100644 --- a/src/it/projects/examples/exclude-package-names/verify.groovy +++ b/src/it/projects/examples/exclude-package-names/verify.groovy @@ -17,7 +17,7 @@ * under the License. */ -File packages = new File( basedir, 'target/site/apidocs/packages' ) +File packages = new File( basedir, 'target/reports/apidocs/packages' ) def expectedPackages = ['com.mycompany.myapp', 'com.mycompany.myapp.package1', diff --git a/src/it/projects/output-encoding/verify.bsh b/src/it/projects/output-encoding/verify.bsh index 7596f657b..d8bf6a4e2 100644 --- a/src/it/projects/output-encoding/verify.bsh +++ b/src/it/projects/output-encoding/verify.bsh @@ -1,63 +1,63 @@ -/* - * 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.*; -import org.codehaus.plexus.util.*; - -boolean result = true; - -boolean checkEncoding( String module, String sourceEncoding, String reportingEncoding ) -{ - print( "module " + module + ", source encoding " + sourceEncoding - + ", expected reporting encoding " + reportingEncoding ); - - File source = new File( basedir, module + "/src/main/java/Test.java" ); - File javadoc = new File( basedir, module + "/target/site/apidocs/Test.html" ); - - String java = FileUtils.fileRead( source, sourceEncoding ); - String html = FileUtils.fileRead( javadoc, reportingEncoding ); - - if ( html.indexOf( "text/html; charset=" + reportingEncoding ) < 0 ) - { - System.err.println( "charset not specified in content-type of " + javadoc ); - return false; - } - - String javaChars = StringUtils.getNestedString( java, "{non-ascii chars delimiter}" ); - String htmlChars = StringUtils.getNestedString( html, "{non-ascii chars delimiter}" ); - - print( "javaChars = " + javaChars ); - print( "htmlChars = " + htmlChars ); - - return javaChars.equals( htmlChars ); -} - -try -{ - result = checkEncoding( "default", "ISO-8859-15", "UTF-8") - && checkEncoding( "encoding", "UTF-8", "UTF-16" ) - && checkEncoding( "docencoding", "UTF-8", "UTF-16" ); -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; +/* + * 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.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +boolean checkEncoding( String module, String sourceEncoding, String reportingEncoding ) +{ + print( "module " + module + ", source encoding " + sourceEncoding + + ", expected reporting encoding " + reportingEncoding ); + + File source = new File( basedir, module + "/src/main/java/Test.java" ); + File javadoc = new File( basedir, module + "/target/reports/apidocs/Test.html" ); + + String java = FileUtils.fileRead( source, sourceEncoding ); + String html = FileUtils.fileRead( javadoc, reportingEncoding ); + + if ( html.indexOf( "text/html; charset=" + reportingEncoding ) < 0 ) + { + System.err.println( "charset not specified in content-type of " + javadoc ); + return false; + } + + String javaChars = StringUtils.getNestedString( java, "{non-ascii chars delimiter}" ); + String htmlChars = StringUtils.getNestedString( html, "{non-ascii chars delimiter}" ); + + print( "javaChars = " + javaChars ); + print( "htmlChars = " + htmlChars ); + + return javaChars.equals( htmlChars ); +} + +try +{ + result = checkEncoding( "default", "ISO-8859-15", "UTF-8") + && checkEncoding( "encoding", "UTF-8", "UTF-16" ) + && checkEncoding( "docencoding", "UTF-8", "UTF-16" ); +} +catch( IOException e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/projects/reproducible/verify.groovy b/src/it/projects/reproducible/verify.groovy index 3033be711..805c1c2e9 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, 'reports/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 96fa23bb8..c5d9ce293 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.build.directory}/reports", required = true) protected File outputDirectory; /** @@ -1695,11 +1696,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() { @@ -1843,7 +1851,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(); @@ -1873,11 +1881,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; } @@ -1923,12 +1926,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(); @@ -5451,7 +5454,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; @@ -5751,7 +5754,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/JavadocJarMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocJarMojo.java index 9679fdd4b..6a58e10b7 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocJarMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocJarMojo.java @@ -94,15 +94,6 @@ public class JavadocJarMojo 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. */ @@ -158,17 +149,12 @@ public class JavadocJarMojo extends AbstractJavadocMojo { /** {@inheritDoc} */ @Override - public void doExecute() throws MojoExecutionException { + protected void doExecute() throws MojoExecutionException { if (skip) { getLog().info("Skipping javadoc generation"); 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 b5058fcce..5c0ca5b10 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java @@ -57,24 +57,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 +110,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 +123,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 +197,23 @@ 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); - return false; - } + public boolean canGenerateReport() throws MavenReportException { + if (skip) { + return false; + } + + Collection sourcePaths = getSourcePaths(); + + Collection collectedSourcePaths = + sourcePaths.stream().flatMap(e -> e.getSourcePaths().stream()).collect(Collectors.toList()); - canGenerate = canGenerateReport(files); + Map> files = getFiles(collectedSourcePaths); + + if (!canGenerateReport(files)) { + return false; } - return canGenerate; + + return true; } /** {@inheritDoc} */ @@ -245,43 +226,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 60d7e08ef..6697e6591 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java @@ -93,7 +93,12 @@ public class ResourcesBundleMojo extends AbstractJavadocMojo { * @see org.apache.maven.plugin.Mojo#execute() */ @Override - public void doExecute() throws MojoExecutionException, MojoFailureException { + protected void doExecute() throws MojoExecutionException, MojoFailureException { + if (skip) { + getLog().info("Skipping javadoc resource bundle generation"); + return; + } + try { buildJavadocOptions(); } catch (IOException e) { diff --git a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJarMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJarMojo.java index 54f3d5977..9fa1c9eaa 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJarMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJarMojo.java @@ -52,13 +52,6 @@ public class TestJavadocJarMojo extends JavadocJarMojo { // 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 c65085bfe..63d1d6595 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/JavadocJarMojoTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarMojoTest.java index 785f58f16..c4b57d2b9 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarMojoTest.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"); - JavadocJarMojo 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 20d837758..d15875564 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java @@ -508,7 +508,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"); @@ -527,7 +527,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) @@ -574,7 +574,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 @@ -1098,7 +1098,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/resources/unit/aggregate-modules-not-in-subdirectories-test/all/pom.xml b/src/test/resources/unit/aggregate-modules-not-in-subdirectories-test/all/pom.xml index ace258172..f365f1127 100644 --- a/src/test/resources/unit/aggregate-modules-not-in-subdirectories-test/all/pom.xml +++ b/src/test/resources/unit/aggregate-modules-not-in-subdirectories-test/all/pom.xml @@ -37,7 +37,7 @@ under the License. ISO-8859-1 - ${basedir}/target/test/unit/aggregate-modules-not-in-subdirectories-test/target/site/apidocs + ${basedir}/target/test/unit/aggregate-modules-not-in-subdirectories-test/target/site ${basedir}/target/test/unit/aggregate-modules-not-in-subdirectories-test/target/javadoc-bundle-options Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API 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 b85d1179e..97367dc1e 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 a0c318b67..ccb54906e 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 6ed8ad0b3..7bbe8fae3 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 ea9799f7f..ff2e928d4 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 a77c595e1..98d960387 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 cb7d63102..6938ceaa5 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 e3ced1510..44a1c9d9e 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 bf3f197ea..80b5dcafd 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 628999936..616a1225a 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 3793d1272..98d4e51ef 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 0a0da4f0a..6235931b7 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 014927a93..097e36bfb 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 65ef5ee35..308c5ad73 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 f669fd3ca..cbbcea6b0 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 28300521b..de9d611f2 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 a91920fce..f0c160e9b 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 638c4d24c..000000000 --- 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 fbfd6ba14..000000000 --- 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 2e5126871..000000000 --- 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 ff0d75dbe..619e35248 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 5221029c2..d72939216 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 447134e23..3e89f1bf9 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 88a45552f..276878854 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 592770664..6bf56394e 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 48307907e..d1a21ffdd 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 7e38262cc..9a77c5b9b 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 f379b7e8d..45a5bf833 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 4ebfbf1cd..042e1ef24 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 cf9875dd9..1bfce939f 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 @@ -43,7 +43,7 @@ under the License. ${basedir}/target/test/unit/stale-test/target pom-test javadoc - ${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 58c7b9854..5a7fdf170 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 978e62a2b..51e6de9de 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 a6b046760..b8025d3aa 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 eb8b6e5ed..6b8f2e8c1 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 ef6dbcacb..019301b6a 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 99845e3c7..19a5a8ac1 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 7abed91c9..cf4eff114 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/testapidocs + ${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 4999e7d77..e259d8489 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 c65279d50..aa7294e32 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 35e1686c6..79e47f17e 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 a484eb857..c06ec8408 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 4ddf68eaa..879b0e843 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