[MJAVADOC-785] Align plugin implementation with AbstractMavenReport (maven-reporting-impl)
diff --git a/pom.xml b/pom.xml
index b842354..5c00d9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,13 @@
<artifactId>maven-reporting-api</artifactId>
<version>4.0.0-M9</version>
</dependency>
+ <!-- for Javaodc purposes -->
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>4.0.0-M13</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
diff --git a/src/it/projects/MJAVADOC-110/verify.bsh b/src/it/projects/MJAVADOC-110/verify.bsh
index 7f18bc0..547fb2b 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 2b94b58..da4e155 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 0995c58..7d82745 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 db27957..325e21b 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 c043751..e325acd 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 d9911d0..655e1cf 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 8cb556c..ef46108 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 b86a5d6..0f30f40 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 d9375a3..b29f53f 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 e159e69..3b17f49 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 1c80f44..b402f93 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 d6a6543..46a7d3d 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 0a9d309..cf9faed 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 f3ad4b0..8f47856 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 0507b02..1e7e4fd 100644
--- a/src/it/projects/MJAVADOC-437/verify.bsh
+++ b/src/it/projects/MJAVADOC-437/verify.bsh
@@ -35,7 +35,7 @@
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 28fdb1f..0b179c4 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 =~ /<a href="modulea\/module-summary\.html">modulea<\/a>/
assert index.text =~ /<a href="moduleb\/module-summary\.html">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 =~ /<a href="modulea-summary.html">modulea<\/a>/
assert overview.text =~ /<a href="moduleb-summary.html">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 ac751d0..d07b2be 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 ce90596..75a25f1 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 d90f357..8aa8285 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 3a870ed..99777a1 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 e75b96c..b0fc0b7 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 =~ /<a href="module1\/module-summary\.html">module1<\/a>/
assert index.text =~ /<a href="module2\/module-summary\.html">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 =~ /<a href="module1-summary.html">module1<\/a>/
assert overview.text =~ /<a href="module2-summary.html">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 ad6c462..693813e 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 a38349a..7929159 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 6fa229a..f63075b 100644
--- a/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy
+++ b/src/it/projects/MJAVADOC-580_detectLinks/verify.groovy
@@ -26,6 +26,6 @@
}
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 =~ /<a href="https:[^"]+Object.html"/
}
diff --git a/src/it/projects/MJAVADOC-590_nooverview/verify.groovy b/src/it/projects/MJAVADOC-590_nooverview/verify.groovy
index cd10da3..220aafd 100644
--- a/src/it/projects/MJAVADOC-590_nooverview/verify.groovy
+++ b/src/it/projects/MJAVADOC-590_nooverview/verify.groovy
@@ -17,8 +17,8 @@
* under the License.
*/
-def file = new File( basedir, 'target/site/apidocs/com/example/MJavaDoc590.html' );
+def file = new File( basedir, 'target/reports/apidocs/com/example/MJavaDoc590.html' );
assert file.exists()
-def overview = new File( basedir, 'target/site/apidocs/overview.html' );
+def overview = new File( basedir, 'target/reports/apidocs/overview.html' );
assert !overview.exists()
diff --git a/src/it/projects/MJAVADOC-592_detectApiLink/verify.groovy b/src/it/projects/MJAVADOC-592_detectApiLink/verify.groovy
index bed3fca..df4b182 100644
--- a/src/it/projects/MJAVADOC-592_detectApiLink/verify.groovy
+++ b/src/it/projects/MJAVADOC-592_detectApiLink/verify.groovy
@@ -17,5 +17,5 @@
* under the License.
*/
-def options = new File(basedir,'target/site/apidocs/options')
+def options = new File(basedir,'target/reports/apidocs/options')
assert options.readLines().dropWhile{it!='-linkoffline'}.get(1).startsWith("'https://docs.oracle.com/javase/8/docs/api")
diff --git a/src/it/projects/MJAVADOC-610_mrjar/verify.groovy b/src/it/projects/MJAVADOC-610_mrjar/verify.groovy
index bbed8f9..fb39254 100644
--- a/src/it/projects/MJAVADOC-610_mrjar/verify.groovy
+++ b/src/it/projects/MJAVADOC-610_mrjar/verify.groovy
@@ -20,5 +20,5 @@
def file = new File( basedir, 'target/mjavadoc610-1.0-SNAPSHOT-javadoc.jar' )
assert file.exists()
-assert new File( basedir, 'target/apidocs/com.foo/com/foo/MyClass.html').exists()
-assert new File( basedir, 'target/apidocs/com.foo/com/foo/OtherClass.html').exists()
+assert new File( basedir, 'target/reports/apidocs/com.foo/com/foo/MyClass.html').exists()
+assert new File( basedir, 'target/reports/apidocs/com.foo/com/foo/OtherClass.html').exists()
diff --git a/src/it/projects/MJAVADOC-611_dependencyLinks/verify.groovy b/src/it/projects/MJAVADOC-611_dependencyLinks/verify.groovy
index f305650..0ddf0cf 100644
--- a/src/it/projects/MJAVADOC-611_dependencyLinks/verify.groovy
+++ b/src/it/projects/MJAVADOC-611_dependencyLinks/verify.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-def options = new File( basedir, 'target/site/apidocs/options' );
+def options = new File( basedir, 'target/reports/apidocs/options' );
assert options.exists() : options + " not found"
def linkLines = options.readLines().dropWhile{it != '-link'}.drop(1).takeWhile{!it.startsWith('-')}
diff --git a/src/it/projects/MJAVADOC-618_modular-war/verify.groovy b/src/it/projects/MJAVADOC-618_modular-war/verify.groovy
index d665081..96e7b1e 100644
--- a/src/it/projects/MJAVADOC-618_modular-war/verify.groovy
+++ b/src/it/projects/MJAVADOC-618_modular-war/verify.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-assert new File( basedir, 'target/apidocs/argfile').readLines().size() == 2
-assert new File( basedir, 'target/apidocs/com.mycompany.lib/com/mycompany/lib/Library.html').exists()
+assert new File( basedir, 'target/reports/apidocs/argfile').readLines().size() == 2
+assert new File( basedir, 'target/reports/apidocs/com.mycompany.lib/com/mycompany/lib/Library.html').exists()
// module descriptor of com.mycompany.app has no exports, so nothing is documented
-assert !new File( basedir, 'target/apidocs/com.mycompany.app/com/mycompany/app/Application.html').exists()
+assert !new File( basedir, 'target/reports/apidocs/com.mycompany.app/com/mycompany/app/Application.html').exists()
diff --git a/src/it/projects/MJAVADOC-619_copyright-year/verify.groovy b/src/it/projects/MJAVADOC-619_copyright-year/verify.groovy
index 525b39c..ac6cef0 100644
--- a/src/it/projects/MJAVADOC-619_copyright-year/verify.groovy
+++ b/src/it/projects/MJAVADOC-619_copyright-year/verify.groovy
@@ -17,6 +17,6 @@
* under the License.
*/
-def file = new File( basedir, 'target/site/apidocs/options' )
+def file = new File( basedir, 'target/reports/apidocs/options' )
assert file.text.contains("'Copyright © 2020. All rights reserved.'")
diff --git a/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh b/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh
index d3e860a..7894b01 100644
--- a/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh
+++ b/src/it/projects/MJAVADOC-620_no-dot-in-version/verify.bsh
@@ -32,17 +32,17 @@
return false;
}
- File apidocs = new File( target, "site/apidocs" );
+ File apidocs = new File( target, "reports/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
- System.err.println( "target/site/apidocs file is missing or not a directory." );
+ System.err.println( "target/reports/apidocs file is missing or not 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." );
+ System.err.println( "target/reports/apidocs/options file is missing or not a file." );
return false;
}
diff --git a/src/it/projects/MJAVADOC-620_top-level-package/verify.bsh b/src/it/projects/MJAVADOC-620_top-level-package/verify.bsh
index d59fb14..8e3e757 100644
--- a/src/it/projects/MJAVADOC-620_top-level-package/verify.bsh
+++ b/src/it/projects/MJAVADOC-620_top-level-package/verify.bsh
@@ -32,17 +32,17 @@
return false;
}
- File apidocs = new File( target, "site/apidocs" );
+ File apidocs = new File( target, "reports/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
- System.err.println( "target/site/apidocs file is missing or not a directory." );
+ System.err.println( "target/reports/apidocs file is missing or not 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." );
+ System.err.println( "target/reports/apidocs/options file is missing or not a file." );
return false;
}
diff --git a/src/it/projects/MJAVADOC-625_addstylesheet/verify.groovy b/src/it/projects/MJAVADOC-625_addstylesheet/verify.groovy
index 8a20228..6f4c8fe 100644
--- a/src/it/projects/MJAVADOC-625_addstylesheet/verify.groovy
+++ b/src/it/projects/MJAVADOC-625_addstylesheet/verify.groovy
@@ -17,7 +17,7 @@
* under the License.
*/
-def file = new File( basedir, 'target/site/apidocs/com/example/MJavaDoc625.html' );
+def file = new File( basedir, 'target/reports/apidocs/com/example/MJavaDoc625.html' );
assert file.exists()
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy b/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy
index 3cb9637..6f09faf 100644
--- a/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy
@@ -19,25 +19,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-
+
int javaVersion = System.getProperty( "java.specification.version" ) as Integer
if ( javaVersion >= 11 ) {
- def index = new File( basedir, 'target/apidocs/index.html')
+ def index = new File( basedir, 'target/reports/apidocs/index.html')
assert index.text =~ /<a href="modulea\/module-summary\.html">modulea<\/a>/
assert index.text =~ /<a href="moduleb\/module-summary\.html">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 =~ /<a href="modulea-summary.html">modulea<\/a>/
assert overview.text =~ /<a href="moduleb-summary.html">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 817ea3d..4906364 100644
--- a/src/it/projects/MJAVADOC-661_mrjar/verify.groovy
+++ b/src/it/projects/MJAVADOC-661_mrjar/verify.groovy
@@ -23,7 +23,7 @@
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 165abb1..86ea1df 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 af443a8..c276427 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 e5b9af4..b5d5547 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 4266397..3320b79 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 4216b3e..11a216d 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 145ebb4..5880219 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 c16fc76..14a8ac4 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 42f0db0..fe0ff69 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 7596f65..d8bf6a4 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 3033be7..805c1c2 100644
--- a/src/it/projects/reproducible/verify.groovy
+++ b/src/it/projects/reproducible/verify.groovy
@@ -24,7 +24,7 @@
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 30385f4..6769f7e 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 @@
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
+ * <a href="https://maven.apache.org/plugins/maven-site-plugin/site-mojo.html#outputDirectory">Maven Site Plugin</a>
+ * is used instead.
+ * @see org.apache.maven.reporting.AbstractMavenReport#outputDirectory
* @see <a href="https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#additional-options-provided-by-the-standard-doclet">Doclet option d</a>
*/
- @Parameter(
- property = "destDir",
- alias = "destDir",
- defaultValue = "${project.build.directory}/apidocs",
- required = true)
+ @Parameter(defaultValue = "${project.build.directory}/reports", required = true)
protected File outputDirectory;
/**
@@ -1684,11 +1685,18 @@
return false;
}
- /**
- * @return the output directory
- */
protected String getOutputDirectory() {
- return outputDirectory.getAbsoluteFile().toString();
+ return outputDirectory.getAbsolutePath();
+ }
+
+ /**
+ * 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 getPluginReportOutputDirectory() {
+ return getOutputDirectory() + "/" + (isTest() ? "test" : "") + "apidocs";
}
protected MavenProject getProject() {
@@ -1832,7 +1840,7 @@
doExecute();
}
- abstract void doExecute() throws MojoExecutionException, MojoFailureException;
+ protected abstract void doExecute() throws MojoExecutionException, MojoFailureException;
protected final void verifyRemovedParameter(String paramName) {
Xpp3Dom configDom = mojoExecution.getConfiguration();
@@ -1862,11 +1870,6 @@
* @throws MavenReportException if any
*/
protected void executeReport(Locale unusedLocale) throws MavenReportException {
- if (skip) {
- getLog().info("Skipping javadoc generation");
- return;
- }
-
if (getLog().isDebugEnabled()) {
this.debug = true;
}
@@ -1912,12 +1915,12 @@
// 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();
@@ -5437,7 +5440,7 @@
}
List<OfflineLink> 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;
@@ -5730,7 +5733,7 @@
// links can be relative paths or files
File dir = new File(link);
if (!dir.isAbsolute()) {
- dir = new File(getOutputDirectory(), link);
+ dir = new File(getPluginReportOutputDirectory(), link);
}
if (!dir.isDirectory()) {
if (detecting) {
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java
index 98bed56..c1a03ec 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java
@@ -95,15 +95,6 @@
// ----------------------------------------------------------------------
/**
- * Specifies the destination directory where javadoc saves the generated HTML files.
- * @see <a href="https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options">Doclet option d</a>.
- * @deprecated
- */
- @Deprecated
- @Parameter(property = "destDir")
- private File destDir;
-
- /**
* Specifies the directory where the generated jar file will be put.
*/
@Parameter(property = "project.build.directory")
@@ -158,17 +149,12 @@
/** {@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 @@
failOnError("RuntimeException: Error while generating Javadoc", e);
}
- if (innerDestDir.exists()) {
- try {
- File outputFile = generateArchive(innerDestDir, finalName + "-" + getClassifier() + ".jar");
+ 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);
+ 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 b5058fc..5c0ca5b 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
@@ -57,25 +57,10 @@
// 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.
- * <br/>
- *
- * @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. <code>project-reports.html</code>).
*
@@ -125,8 +110,6 @@
/** {@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 @@
/** {@inheritDoc} */
@Override
public String getOutputName() {
- return destDir + "/index";
+ return (isTest() ? "test" : "") + "apidocs" + "/index";
}
/** {@inheritDoc} */
@@ -214,25 +197,23 @@
* </table>
*/
@Override
- public boolean canGenerateReport() {
- boolean canGenerate = false;
-
- if (!skip && (this.isAggregator() || !"pom".equals(this.project.getPackaging()))) {
- Collection<Path> sourcePaths;
- Map<Path, Collection<String>> 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;
- }
-
- canGenerate = canGenerateReport(files);
+ public boolean canGenerateReport() throws MavenReportException {
+ if (skip) {
+ return false;
}
- return canGenerate;
+
+ Collection<JavadocModule> sourcePaths = getSourcePaths();
+
+ Collection<Path> collectedSourcePaths =
+ sourcePaths.stream().flatMap(e -> e.getSourcePaths().stream()).collect(Collectors.toList());
+
+ Map<Path, Collection<String>> files = getFiles(collectedSourcePaths);
+
+ if (!canGenerateReport(files)) {
+ return false;
+ }
+
+ return true;
}
/** {@inheritDoc} */
@@ -245,43 +226,38 @@
@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);
- }
-
- 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;
- }
+ this.reportOutputDirectory = reportOutputDirectory;
+ this.outputDirectory = reportOutputDirectory;
}
/** {@inheritDoc} */
@Override
- public void doExecute() throws MojoExecutionException, MojoFailureException {
+ protected String getPluginReportOutputDirectory() {
+ return getReportOutputDirectory().getAbsolutePath() + "/" + (isTest() ? "test" : "") + "apidocs";
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ 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 60d7e08..6697e65 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 @@
* @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/TestJavadocJar.java b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
index 3da9182..b486bd6 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
@@ -53,13 +53,6 @@
// ----------------------------------------------------------------------
/**
- * Specifies the destination directory where Javadoc saves the generated HTML files.
- * @see <a href="https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options">Doclet option d</a>.
- */
- @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 <a href="https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options">Doclet option doctitle</a>.
* @since 2.5
@@ -125,11 +118,6 @@
// ----------------------------------------------------------------------
@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 c65085b..63d1d65 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
@@ -93,22 +93,6 @@
// ----------------------------------------------------------------------
/**
- * 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.
- * <br/>
- */
- @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...).
* <br/>
* Could be used in addition of <code>docfilessubdirs</code> parameter.
@@ -171,46 +155,6 @@
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 @@
links = new ArrayList<>();
}
- // TODO the prerequisite is that the main report is in apidocs
- File apidocs = new File(getReportOutputDirectory().getParentFile(), "apidocs");
+ File apidocs = new File(getReportOutputDirectory(), "apidocs");
if (apidocs.isDirectory() && !links.contains("../apidocs")) {
links.add("../apidocs");
}
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
index 49719af..82ed8cd 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
@@ -135,25 +135,6 @@
assertThat(generatedFile).exists();
}
- /**
- * Test when the specified destDir parameter has an invalid value
- *
- * @throws Exception if any
- */
- public void testInvalidDestdir() throws Exception {
- File testPom = new File(
- getBasedir(),
- "src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml");
- JavadocJar mojo = lookupMojo(testPom);
- mojo.execute();
-
- // check if the javadoc jar file was generated
- File generatedFile = new File(
- getBasedir(),
- "target/test/unit/javadocjar-invalid-destdir/target/javadocjar-invalid-destdir-javadoc.jar");
- assertThat(generatedFile).doesNotExist();
- }
-
public void testContinueIfFailOnErrorIsFalse() throws Exception {
File testPom = new File(
getBasedir(),
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index cb282d0..85494cc 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -505,7 +505,7 @@
new File(getBasedir(), "target/test/unit/doclet-test/target/site/apidocs/graph.dot").toPath();
assertThat(generatedFile).exists();
- Path optionsFile = new File(mojo.getOutputDirectory(), "options").toPath();
+ Path optionsFile = new File(mojo.getPluginReportOutputDirectory(), "options").toPath();
assertThat(optionsFile).exists();
String options = readFile(optionsFile);
assertThat(options).contains("/target/local-repo/umlgraph/UMLGraph/2.1/UMLGraph-2.1.jar");
@@ -524,7 +524,7 @@
generatedFile = new File(getBasedir(), "target/test/unit/doclet-test/target/site/apidocs/graph.dot").toPath();
assertThat(generatedFile).exists();
- optionsFile = new File(mojo.getOutputDirectory(), "options").toPath();
+ optionsFile = new File(mojo.getPluginReportOutputDirectory(), "options").toPath();
assertThat(optionsFile).exists();
options = readFile(optionsFile);
assertThat(options)
@@ -571,7 +571,7 @@
JavadocReport mojo = lookupMojo(testPom);
mojo.execute();
- Path optionsFile = new File(mojo.getOutputDirectory(), "options").toPath();
+ Path optionsFile = new File(mojo.getPluginReportOutputDirectory(), "options").toPath();
assertThat(optionsFile).exists();
// check for a part of the window title
@@ -1096,7 +1096,7 @@
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 ace2581..f365f11 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 @@
<configuration>
<encoding>ISO-8859-1</encoding>
<project implementation="org.apache.maven.plugins.javadoc.stubs.AggregateNotInSubDirectoryTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/aggregate-modules-not-in-subdirectories-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/aggregate-modules-not-in-subdirectories-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/aggregate-modules-not-in-subdirectories-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API</windowtitle>
<reactorProjects>
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 b85d117..97367dc 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 @@
<configuration>
<encoding>ISO-8859-1</encoding>
<project implementation="org.apache.maven.plugins.javadoc.stubs.AggregateResourcesTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/aggregate-resources-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/aggregate-resources-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/aggregate-resources-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin aggregate resources 1.0-SNAPSHOT API</windowtitle>
<reactorProjects>
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 a0c318b..ccb5490 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.AggregateTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/aggregate-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/aggregate-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/aggregate-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 6ed8ad0..7bbe8fa 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.CustomConfigurationMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/custom-configuration/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/custom-configuration/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/custom-configuration/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>true</old>
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 ea9799f..ff2e928 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.DefaultConfigurationMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/default-configuration/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/default-configuration/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/default-configuration/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 a77c595..98d9603 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.DocfilesTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/docfiles-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/docfiles-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/docfiles-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 cb7d631..6938cea 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.DocfilesWithJavaTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/docfiles-with-java-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/docfiles-with-java-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/docfiles-with-java-test/target/javadoc-bundle-options</javadocOptionsDir>
<javadocDirectory>${basedir}/src/test/resources/unit/docfiles-with-java-test/src/main</javadocDirectory>
<breakiterator>false</breakiterator>
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 e3ced15..44a1c9d 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.DocletPathTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/doclet-path-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/doclet-path-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/doclet-path-test/target/javadoc-bundle-options</javadocOptionsDir>
<doclet>UmlGraph</doclet>
<docletArtifacts>
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 bf3f197..80b5dca 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.DocletTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/doclet-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/doclet-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/doclet-test/target/javadoc-bundle-options</javadocOptionsDir>
<doclet>UmlGraph</doclet>
<docletArtifact>
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 6289999..616a122 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.SubpackagesTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/file-include-exclude-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/file-include-exclude-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/file-include-exclude-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 3793d12..98d4e51 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.HeaderFooterTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/header-footer-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/header-footer-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/header-footer-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
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 0a0da4f..6235931 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.HelpFileMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/helpfile-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/helpfile-test/target/site</outputDirectory>
<javadocDirectory>${basedir}/src/test/resources/unit/helpfile-test/src/main/javadoc</javadocDirectory>
<breakiterator>false</breakiterator>
<old>false</old>
diff --git a/src/test/resources/unit/helpfile-test/pom.xml b/src/test/resources/unit/helpfile-test/pom.xml
index 014927a..097e36b 100644
--- a/src/test/resources/unit/helpfile-test/pom.xml
+++ b/src/test/resources/unit/helpfile-test/pom.xml
@@ -35,7 +35,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.HelpFileMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/helpfile-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/helpfile-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/helpfile-test/target/javadoc-bundle-options</javadocOptionsDir>
<javadocDirectory>${basedir}/src/test/resources/unit/helpfile-test/src/main/javadoc</javadocDirectory>
<breakiterator>false</breakiterator>
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 65ef5ee..308c5ad 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.DefaultConfigurationMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/javaHome-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/javaHome-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/javaHome-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 f669fd3..cbbcea6 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 @@
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.JavadocJarArchiveConfigProjectStub"/>
<jarOutputDirectory>${basedir}/target/test/unit/javadocjar-archive-config/target</jarOutputDirectory>
- <outputDirectory>${basedir}/target/test/unit/javadocjar-archive-config/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/javadocjar-archive-config/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/javadocjar-archive-config/target/javadoc-bundle-options</javadocOptionsDir>
<finalName>javadocjar-archive-config</finalName>
<classifier>javadoc</classifier>
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 2830052..de9d611 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 @@
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.JavadocJarDefaultMavenProjectStub"/>
<jarOutputDirectory>${basedir}/target/test/unit/javadocjar-default/target</jarOutputDirectory>
- <outputDirectory>${basedir}/target/test/unit/javadocjar-default/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/javadocjar-default/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/javadocjar-default/target/javadoc-bundle-options</javadocOptionsDir>
<finalName>javadocjar-default</finalName>
<classifier>javadoc</classifier>
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 a91920f..f0c160e 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 @@
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.JavadocJarFailOnErrorMavenProjectStub"/>
<jarOutputDirectory>${basedir}/target/test/unit/javadocjar-failonerror/target</jarOutputDirectory>
- <outputDirectory>${basedir}/target/test/unit/javadocjar-failonerror/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/javadocjar-failonerror/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/javadocjar-failonerror/target/javadoc-bundle-options</javadocOptionsDir>
<finalName>javadocjar-failonerror</finalName>
<attach>true</attach>
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 638c4d2..0000000
--- a/src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
-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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.unit</groupId>
- <artifactId>javadocjar-invalid-destdir</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <inceptionYear>2006</inceptionYear>
- <name>Maven Javadoc Plugin Javadoc Jar Invalid Destdir Test</name>
- <url>http://maven.apache.org</url>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <project implementation="org.apache.maven.plugins.javadoc.stubs.JavadocJarInvalidDestdirMavenProjectStub"/>
- <destDir>${basedir}/target/test/unit/javadocjar-invalid-destdir/target/invalid</destDir>
- <jarOutputDirectory>${basedir}/target/test/unit/javadocjar-invalid-destdir/target</jarOutputDirectory>
- <outputDirectory>${basedir}/target/test/unit/javadocjar-invalid-destdir/target/site/apidocs</outputDirectory>
- <javadocOptionsDir>${basedir}/target/test/unit/javadocjar-invalid-destdir/target/javadoc-bundle-options</javadocOptionsDir>
- <finalName>javadocjar-invalid-destdir</finalName>
- <attach>true</attach>
- <breakiterator>false</breakiterator>
- <old>false</old>
- <show>protected</show>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <author>true</author>
- <encoding>ISO-8859-1</encoding>
- <docfilessubdirs>false</docfilessubdirs>
- <linksource>false</linksource>
- <nocomment>false</nocomment>
- <nodeprecated>false</nodeprecated>
- <nodeprecatedlist>false</nodeprecatedlist>
- <nohelp>false</nohelp>
- <noindex>false</noindex>
- <nonavbar>false</nonavbar>
- <nosince>false</nosince>
- <notree>false</notree>
- <serialwarn>false</serialwarn>
- <splitindex>false</splitindex>
- <stylesheet>java</stylesheet>
- <groups/>
- <tags/>
- <use>true</use>
- <version>true</version>
- <windowtitle>Maven Javadoc Plugin Javadoc Jar Invalid Destdir Test 1.0-SNAPSHOT API</windowtitle>
- <debug>true</debug>
- <failOnError>true</failOnError>
- <reactorProjects>
- <project implementation="org.apache.maven.plugins.javadoc.stubs.JavadocJarInvalidDestdirMavenProjectStub"/>
- </reactorProjects>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
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 fbfd6ba..0000000
--- 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 2e51268..0000000
--- 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 ff0d75d..619e352 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.Jdk5TestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/jdk5-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/jdk5-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/jdk5-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
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 5221029..d729392 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.Jdk6TestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/jdk6-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/jdk6-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/jdk6-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
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 447134e..3e89f1b 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.NewlineTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/newline-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/newline-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/newline-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
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 88a4555..2768788 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.OptionsUmlautEncodingMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/optionsumlautencoding-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/optionsumlautencoding-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/optionsumlautencoding-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 5927706..6bf5639 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.PomMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/pom-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/pom-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/pom-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
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 4830790..d1a21ff 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 @@
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.ProxyTestMavenProjectStub"/>
<settings implementation="org.apache.maven.plugins.javadoc.stubs.SettingsStub"/>
- <outputDirectory>${basedir}/target/test/unit/proxy-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/proxy-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/proxy-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
diff --git "a/src/test/resources/unit/quotedpath\047test/quotedpath-test-plugin-config.xml" "b/src/test/resources/unit/quotedpath\047test/quotedpath-test-plugin-config.xml"
index 7e38262..9a77c5b 100644
--- "a/src/test/resources/unit/quotedpath\047test/quotedpath-test-plugin-config.xml"
+++ "b/src/test/resources/unit/quotedpath\047test/quotedpath-test-plugin-config.xml"
@@ -34,7 +34,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.QuotedPathMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/quotedpath'test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/quotedpath'test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/quotedpath'test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 f379b7e..45a5bf8 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.ResourcesTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/resources-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/resources-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/resources-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin resources 1.0-SNAPSHOT API</windowtitle>
<javadocDirectory>${basedir}/src/test/resources/unit/resources-test/src/main/javadoc</javadocDirectory>
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 4ebfbf1..042e1ef 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.ResourcesWithExcludesTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/resources-with-excludes-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/resources-with-excludes-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/resources-with-excludes-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin resources 1.0-SNAPSHOT API</windowtitle>
<javadocDirectory>${basedir}/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc</javadocDirectory>
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 cf9875d..1bfce93 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 @@
<jarOutputDirectory>${basedir}/target/test/unit/stale-test/target</jarOutputDirectory>
<finalName>pom-test</finalName>
<classifier>javadoc</classifier>
- <outputDirectory>${basedir}/target/test/unit/stale-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/stale-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/stale-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
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 58c7b98..5a7fdf1 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.StylesheetFileMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/stylesheetfile-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/stylesheetfile-test/target/site</outputDirectory>
<javadocDirectory>${basedir}/src/test/resources/unit/stylesheetfile-test/src/main/javadoc</javadocDirectory>
<breakiterator>false</breakiterator>
<old>false</old>
diff --git a/src/test/resources/unit/stylesheetfile-test/pom.xml b/src/test/resources/unit/stylesheetfile-test/pom.xml
index 978e62a..51e6de9 100644
--- a/src/test/resources/unit/stylesheetfile-test/pom.xml
+++ b/src/test/resources/unit/stylesheetfile-test/pom.xml
@@ -35,7 +35,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.StylesheetFileMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/stylesheetfile-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/stylesheetfile-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/stylesheetfile-test/target/javadoc-bundle-options</javadocOptionsDir>
<javadocDirectory>${basedir}/src/test/resources/unit/stylesheetfile-test/src/main/javadoc</javadocDirectory>
<breakiterator>false</breakiterator>
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 a6b0467..b8025d3 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.SubpackagesTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/subpackages-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/subpackages-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/subpackages-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 eb8b6e5..6b8f2e8 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.TagTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/tag-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/tag-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/tag-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Javadoc Plugin tag 1.0-SNAPSHOT API</windowtitle>
<show>protected</show>
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 ef6dbca..019301b 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.TagletTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/taglet-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/taglet-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/taglet-test/target/javadoc-bundle-options</javadocOptionsDir>
<taglet>org.tullmann.taglets.ToDo</taglet>
<tagletArtifact>
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 99845e3..19a5a8a 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.TagletArtifactsMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/tagletArtifacts-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/tagletArtifacts-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/tagletArtifacts-test/target/javadoc-bundle-options</javadocOptionsDir>
<breakiterator>false</breakiterator>
<old>false</old>
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 7abed91..cf4eff1 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.TestJavadocMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/test-javadoc-test/target/site/testapidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/test-javadoc-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/test-javadoc-test/target/javadoc-bundle-options</javadocOptionsDir>
<windowtitle>Maven Test Javadoc Plugin aggregate resources 1.0-SNAPSHOT API</windowtitle>
<show>protected</show>
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 4999e7d..e259d84 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.StandardDocletConflictOptionsTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<encoding>ISO-8859-1</encoding>
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 c65279d..aa7294e 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
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 35e1686..79e47f1 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
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 a484eb8..c06ec84 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
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 4ddf68e..879b0e8 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 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<project implementation="org.apache.maven.plugins.javadoc.stubs.WrongEncodingOptionsTestMavenProjectStub"/>
- <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site/apidocs</outputDirectory>
+ <outputDirectory>${basedir}/target/test/unit/validate-options-test/target/site</outputDirectory>
<javadocOptionsDir>${basedir}/target/test/unit/validate-options-test/target/javadoc-bundle-options</javadocOptionsDir>
<show>protected</show>
<groups/>
