You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/11/04 11:01:45 UTC
svn commit: r1814274 [2/8] - in /maven/plugins/trunk/maven-javadoc-plugin:
./ src/it/ src/it/MJAVADOC-110/ src/it/MJAVADOC-126/ src/it/MJAVADOC-137/
src/it/MJAVADOC-172/ src/it/MJAVADOC-180/ src/it/MJAVADOC-181/
src/it/MJAVADOC-194/ src/it/MJAVADOC-250...
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1814274&r1=1814273&r2=1814274&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sat Nov 4 11:01:38 2017
@@ -411,6 +411,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <projectsDirectory>src/it/projects</projectsDirectory>
+ <settingsFile>src/it/mrm/settings.xml</settingsFile>
<pomExcludes>
<pomExclude>MJAVADOC-181/pom.xml</pomExclude> <!-- seems to be wrong, see comment in Jira issue -->
<pomExclude>output-encoding/pom.xml</pomExclude>
@@ -419,8 +422,48 @@ under the License.
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
</properties>
+ <filterProperties>
+ <mrm.3rdparty.url>${mrm.3rdparty.url}</mrm.3rdparty.url>
+ </filterProperties>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>mrm-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ <executions>
+ <execution>
+ <id>repository</id>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ <configuration>
+ <repositories>
+ <mockRepo>
+ <source>src/it/mrm/repository</source>
+ </mockRepo>
+ <proxyRepo/>
+ </repositories>
+ </configuration>
+ </execution>
+ <execution>
+ <id>3rdparty</id>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ <configuration>
+ <repositories>
+ <mockRepo>
+ <source>src/it/mrm/3rdparty</source>
+ </mockRepo>
+ </repositories>
+ <propertyName>mrm.3rdparty.url</propertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/mrm/3rdparty/lib-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/mrm/3rdparty/lib-1.0.pom?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/mrm/3rdparty/lib-1.0.pom (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/mrm/3rdparty/lib-1.0.pom Sat Nov 4 11:01:38 2017
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ 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.javadoc.its</groupId>
+ <artifactId>lib</artifactId>
+ <version>1.0</version>
+
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/mrm/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/mrm/settings.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/mrm/settings.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/mrm/settings.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,73 @@
+<!--
+ 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.it</groupId>
+ <artifactId>maven-javadoc-test</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Maven Javadoc Test</name>
+
+ <modules>
+ <module>test-module</module>
+ </modules>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@sitePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <debug>true</debug>
+ </configuration>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+ <inherited>false</inherited>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <aggregate>false</aggregate>
+ <sourcepath>test-module/src/main/java</sourcepath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/test-module/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/test-module/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/test-module/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/test-module/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,33 @@
+<!--
+ 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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>maven-javadoc-test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>test-module</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test Module</name>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/test-module/src/main/java/Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/test-module/src/main/java/Test.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/test-module/src/main/java/Test.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/test-module/src/main/java/Test.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+/**
+ * Sample class inside the package to be included in the javadoc
+ *
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+public class Test
+{
+ /**
+ * 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 that prints out the parameter string.
+ *
+ * @param str The string value to be printed.
+ */
+ protected void sampleMethod( String str )
+ {
+ System.out.println( str );
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/verify.bsh?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/verify.bsh (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-110/verify.bsh Sat Nov 4 11:01:38 2017
@@ -0,0 +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;
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/invoker.properties?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/invoker.properties (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/invoker.properties Sat Nov 4 11:01:38 2017
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals=clean install
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,50 @@
+<!--
+ 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.it</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Javadoc Test</name>
+
+ <modules>
+ <module>res1</module>
+ <module>res2</module>
+ <module>test</module>
+ </modules>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res1/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res1/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res1/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +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.
+-->
+
+<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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>res1</artifactId>
+ <packaging>jar</packaging>
+ <name>Resource jar 1</name>
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res1/src/main/resources/file1.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res1/src/main/resources/file1.txt?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res1/src/main/resources/file1.txt (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res1/src/main/resources/file1.txt Sat Nov 4 11:01:38 2017
@@ -0,0 +1,16 @@
+# 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.
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res2/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res2/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res2/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +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.
+-->
+
+<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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>res2</artifactId>
+ <packaging>jar</packaging>
+ <name>Resource jar 2</name>
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res2/src/main/resources/file2.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res2/src/main/resources/file2.txt?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res2/src/main/resources/file2.txt (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/res2/src/main/resources/file2.txt Sat Nov 4 11:01:38 2017
@@ -0,0 +1,16 @@
+# 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.
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/test/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/test/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/test/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,64 @@
+<!--
+ 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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.maven.plugins.maven-javadoc-plugin.it</artifactId>
+ <packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <debug>true</debug>
+ </configuration>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <resourcesArtifacts>
+ <resourcesArtifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>res1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </resourcesArtifact>
+ <resourcesArtifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>res2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </resourcesArtifact>
+ </resourcesArtifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/test/src/main/java/test/TestClass.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/test/src/main/java/test/TestClass.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/test/src/main/java/test/TestClass.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/test/src/main/java/test/TestClass.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,28 @@
+package test;
+
+/*
+ * 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 simple test class
+ */
+public class TestClass
+{
+
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/verify.bsh?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/verify.bsh (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-126/verify.bsh Sat Nov 4 11:01:38 2017
@@ -0,0 +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;
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/invoker.properties?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/invoker.properties (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/invoker.properties Sat Nov 4 11:01:38 2017
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals=clean javadoc:jar
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +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.
+-->
+
+<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.it</groupId>
+ <artifactId>test-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Maven MJAVADOC-137 test</name>
+ <url>http://maven.apache.org</url>
+
+ <description>
+ Tests that 'mvn javadoc:jar' produces javadoc jars in each sub-project
+ when run from the parent. This broke when @aggregator was added to the
+ javadoc plugin as part of MJAVADOC-104.
+ </description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@sitePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>test1</module>
+ <module>test2</module>
+ </modules>
+
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test1/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test1/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test1/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +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.
+-->
+
+<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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>test-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>test1</artifactId>
+ <packaging>jar</packaging>
+ <name>test1</name>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test1/src/main/java/com/example/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test1/src/main/java/com/example/App.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test1/src/main/java/com/example/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test1/src/main/java/com/example/App.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,32 @@
+package com.example;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test2/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test2/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test2/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +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.
+-->
+
+<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
+ >
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>test-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>test2</artifactId>
+ <packaging>jar</packaging>
+ <name>test2</name>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test2/src/main/java/com/example/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test2/src/main/java/com/example/App.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test2/src/main/java/com/example/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/test2/src/main/java/com/example/App.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,32 @@
+package com.example;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/verify.bsh?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/verify.bsh (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-137/verify.bsh Sat Nov 4 11:01:38 2017
@@ -0,0 +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.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "test1/target/test1-1.0-SNAPSHOT-javadoc.jar" );
+ if ( !target.exists() )
+ {
+ System.err.println( "Javadoc jar for module test1 is missing." );
+ return false;
+ }
+
+ File target = new File( basedir, "test2/target/test2-1.0-SNAPSHOT-javadoc.jar" );
+ if ( !target.exists() )
+ {
+ System.err.println( "Javadoc jar for module test2 is missing." );
+ return false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,71 @@
+<!--
+ 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.it</groupId>
+ <artifactId>maven-MJAVADOC-172-test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Maven MJAVADOC-172 Test</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <modules>
+ <module>test-module1</module>
+ <module>test-module2</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@sitePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <debug>true</debug>
+ </configuration>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module1/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module1/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module1/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,40 @@
+<!--
+ 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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>maven-MJAVADOC-172-test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>test-module1</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test Module 1</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module1/src/main/java/Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module1/src/main/java/Test.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module1/src/main/java/Test.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module1/src/main/java/Test.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+/**
+ * Sample class inside the package to be included in the javadoc
+ *
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+public class Test
+{
+ /**
+ * 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 that prints out the parameter string.
+ *
+ * @param str The string value to be printed.
+ */
+ protected void sampleMethod( String str )
+ {
+ System.out.println( str );
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module2/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module2/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module2/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,40 @@
+<!--
+ 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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>maven-MJAVADOC-172-test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>test-module2</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test Module 2</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module2/src/main/java/Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module2/src/main/java/Test.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module2/src/main/java/Test.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/test-module2/src/main/java/Test.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+/**
+ * Sample class inside the package to be included in the javadoc
+ *
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+public class Test
+{
+ /**
+ * 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 that prints out the parameter string.
+ *
+ * @param str The string value to be printed.
+ */
+ protected void sampleMethod( String str )
+ {
+ System.out.println( str );
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/verify.bsh?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/verify.bsh (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-172/verify.bsh Sat Nov 4 11:01:38 2017
@@ -0,0 +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-3.8.2.jar" ) )
+ {
+ System.err.println( "Javadoc doesn't used correct artifacts." );
+ return false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/invoker.properties?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/invoker.properties (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/invoker.properties Sat Nov 4 11:01:38 2017
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals=clean javadoc:test-aggregate
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ 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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-180</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>module1</artifactId>
+ <name>module1</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/src/main/java/edu/jhu/library/HelloWorld.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/src/main/java/edu/jhu/library/HelloWorld.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/src/main/java/edu/jhu/library/HelloWorld.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/src/main/java/edu/jhu/library/HelloWorld.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,35 @@
+package edu.jhu.library;
+
+/*
+ * 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.
+ */
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: esm
+ * Date: May 17, 2008
+ * Time: 11:26:25 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class HelloWorld
+{
+ public String hello( String s )
+ {
+ return s;
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,44 @@
+package edu.jhu.library;
+
+/*
+ * 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 junit.framework.TestCase;
+import org.dbunit.database.IDatabaseConnection;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: esm
+ * Date: May 17, 2008
+ * Time: 11:28:04 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class Mjavadoc180Test
+ extends TestCase
+{
+ /**
+ * This is some test javadoc. This test method has a phony dependency on DB Unit.
+ */
+ public void testMJAVADOC180()
+ {
+ IDatabaseConnection phony = null;
+ final HelloWorld hw = new HelloWorld();
+ assertTrue( "Hello World".equals( hw.hello( "Hello World" ) ) );
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ 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.it</groupId>
+ <artifactId>MJAVADOC-180</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>MJAVADOC-180</name>
+
+ <modules>
+ <module>module1</module>
+ </modules>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.4</maven.compiler.source>
+ <maven.compiler.target>1.4</maven.compiler.target>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@sitePluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ <inherited>true</inherited>
+ <configuration>
+ <debug>true</debug>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <show>protected</show>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/verify.bsh?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/verify.bsh (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-180/verify.bsh Sat Nov 4 11:01:38 2017
@@ -0,0 +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;
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/application/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/application/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/application/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/application/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>application</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Application</name>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ <configuration>
+ <groups>
+ <group>
+ <title>Main</title>
+ <packages>app</packages>
+ </group>
+ </groups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/application/src/main/java/app/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/application/src/main/java/app/App.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/application/src/main/java/app/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/application/src/main/java/app/App.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,43 @@
+package app;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world class.
+ *
+ * @m.foo A 1st custom javadoc tag.
+ * @author Me
+ * @version 1st
+ * @m.bar A 2nd custom javadoc tag.
+ * @see String#startsWith(String)
+ */
+public class App
+{
+ /**
+ * Hello world method.
+ *
+ * @m.foo A 1st custom javadoc tag.
+ * @see String#endsWith(String)
+ */
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/invoker.properties?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/invoker.properties (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/invoker.properties Sat Nov 4 11:01:38 2017
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals=clean site
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-a/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-a/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-a/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>library</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>module-a</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Module.A</name>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,43 @@
+package aaa;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world class.
+ *
+ * @m.foo A 1st custom javadoc tag.
+ * @author Me
+ * @version 1st
+ * @m.bar A 2nd custom javadoc tag.
+ * @see String#startsWith(String)
+ */
+public class App
+{
+ /**
+ * Hello world method.
+ *
+ * @m.foo A 1st custom javadoc tag.
+ * @see String#endsWith(String)
+ */
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-b/pom.xml?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-b/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-b/pom.xml Sat Nov 4 11:01:38 2017
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>library</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>module-b</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Module.B</name>
+</project>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-b/src/main/java/bbb/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-b/src/main/java/bbb/App.java?rev=1814274&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-b/src/main/java/bbb/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/projects/MJAVADOC-181/library/module-b/src/main/java/bbb/App.java Sat Nov 4 11:01:38 2017
@@ -0,0 +1,43 @@
+package bbb;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world class.
+ *
+ * @m.foo A 1st custom javadoc tag.
+ * @author Me
+ * @version 1st
+ * @m.bar A 2nd custom javadoc tag.
+ * @see String#startsWith(String)
+ */
+public class App
+{
+ /**
+ * Hello world method.
+ *
+ * @m.foo A 1st custom javadoc tag.
+ * @see String#endsWith(String)
+ */
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}