You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2010/04/12 21:44:12 UTC
svn commit: r933380 [1/3] - in /maven/plugins/trunk/maven-javadoc-plugin: ./
src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/ src/it/MJAVADOC-280-3/
src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/
src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/ src/it/MJAVADOC-280...
Author: jdcasey
Date: Mon Apr 12 19:44:10 2010
New Revision: 933380
URL: http://svn.apache.org/viewvc?rev=933380&view=rev
Log:
[MJAVADOC-280] Fixing IT from previous work, adding support for javadoc-resource bundles that allow non-source javadoc configs and resources to be aggregated via dependencies, and added tests for this new support.
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml
- copied, changed from r933339, maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/ResourcesBundleMojo.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestResourcesBundleMojo.java (with props)
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/JavadocBundle.java (with props)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/SourceResolverConfig.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/mdo/javadocOptions.mdo
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=933380&r1=933379&r2=933380&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Mon Apr 12 19:44:10 2010
@@ -307,11 +307,14 @@ under the License.
<execution>
<goals>
<goal>java</goal>
+ <goal>xpp3-reader</goal>
+ <goal>xpp3-writer</goal>
</goals>
</execution>
</executions>
<configuration>
- <version>1.0.0</version>
+ <version>1.1.0</version>
+ <useJava5>true</useJava5>
<models>
<model>src/main/mdo/javadocOptions.mdo</model>
</models>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml?rev=933380&r1=933379&r2=933380&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml Mon Apr 12 19:44:10 2010
@@ -2,24 +2,21 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>MJAVADOC-280-2</artifactId>
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
<artifactId>MJAVADOC-280-2-distro</artifactId>
<name>MJAVADOC-280-2-distro</name>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>${project.parent.artifactId}-modA</artifactId>
+ <artifactId>MJAVADOC-280-2-modA</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>${project.parent.artifactId}-modB</artifactId>
+ <artifactId>MJAVADOC-280-2-modB</artifactId>
<version>${project.version}</version>
</dependency>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/pom.xml?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/pom.xml Mon Apr 12 19:44:10 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-3</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-3-distro</artifactId>
+ <name>MJAVADOC-280-3-distro</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.parent.artifactId}-modA</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.parent.artifactId}-modB</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+ <dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/pom.xml?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/pom.xml Mon Apr 12 19:44:10 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-3</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-3-modA</artifactId>
+ <name>MJAVADOC-280-3-modA</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag><name>.foo</name><placement>optm</placement><head>Foo:</head></tag>
+ <tag><name>author</name></tag>
+ <tag><name>version</name></tag>
+ <tag><name>.bar</name><placement>tcmf</placement><head>Bar:</head></tag>
+ <tag><name>see</name></tag>
+ </tags>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java Mon Apr 12 19:44:10 2010
@@ -0,0 +1,17 @@
+package org.apache.maven.plugins.mjavadoc.it.moda;
+
+/**
+ * Hello world!
+ * @.foo A 1st custom javadoc tag.
+ * @author Me
+ * @version 1st
+ * @.bar A 2nd custom javadoc tag.
+ * @see String#startsWith(String)
+ */
+public class App
+{
+ public static void main( final String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java Mon Apr 12 19:44:10 2010
@@ -0,0 +1,38 @@
+package org.apache.maven.plugins.mjavadoc.it.moda;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( final String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/pom.xml?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/pom.xml Mon Apr 12 19:44:10 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-3</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-3-modB</artifactId>
+ <name>MJAVADOC-280-3-modB</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag><name>.foo</name><placement>optm</placement><head>Foo:</head></tag>
+ <tag><name>author</name></tag>
+ <tag><name>version</name></tag>
+ <tag><name>.bar</name><placement>tcmf</placement><head>Bar:</head></tag>
+ <tag><name>see</name></tag>
+ </tags>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java Mon Apr 12 19:44:10 2010
@@ -0,0 +1,17 @@
+package org.apache.maven.plugins.mjavadoc.it.modb;
+
+/**
+ * Hello world!
+ * @.foo A 1st custom javadoc tag.
+ * @author Me
+ * @version 1st
+ * @.bar A 2nd custom javadoc tag.
+ * @see String#startsWith(String)
+ */
+public class App
+{
+ public static void main( final String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java Mon Apr 12 19:44:10 2010
@@ -0,0 +1,38 @@
+package org.apache.maven.plugins.mjavadoc.it.modb;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( final String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/MJAVADOC-280-3-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/pom.xml?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/pom.xml Mon Apr 12 19:44:10 2010
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-3</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>MJAVADOC-280-3-modA</module>
+ <module>MJAVADOC-280-3-modB</module>
+ <module>MJAVADOC-280-3-distro</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <!-- <version>2.6.2-SNAPSHOT</version> -->
+ <version>@pom.version@</version>
+ <configuration>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>javadoc-jars</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh Mon Apr 12 19:44:10 2010
@@ -0,0 +1,32 @@
+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;
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-3/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml (from r933339, maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml?p2=maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml&p1=maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml&r1=933339&r2=933380&rev=933380&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-distro/pom.xml Mon Apr 12 19:44:10 2010
@@ -2,24 +2,22 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>MJAVADOC-280-2</artifactId>
- <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>MJAVADOC-280-2-distro</artifactId>
- <name>MJAVADOC-280-2-distro</name>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ <artifactId>MJAVADOC-280-4-distro</artifactId>
+
+ <name>MJAVADOC-280-4-distro</name>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>${project.parent.artifactId}-modA</artifactId>
+ <artifactId>MJAVADOC-280-4-modA</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>${project.parent.artifactId}-modB</artifactId>
+ <artifactId>MJAVADOC-280-4-modB</artifactId>
<version>${project.version}</version>
</dependency>
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/pom.xml?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/pom.xml Mon Apr 12 19:44:10 2010
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-4-projects</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-4-modA</artifactId>
+ <name>MJAVADOC-280-4-modA</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java Mon Apr 12 19:44:10 2010
@@ -0,0 +1,18 @@
+package org.apache.maven.plugins.mjavadoc.it.moda;
+
+/**
+ * Hello world!
+ *
+ * @.foo A 1st custom javadoc tag.
+ * @author Me
+ * @version 1st
+ * @.bar A 2nd custom javadoc tag.
+ * @see String#startsWith(String)
+ */
+public class App
+{
+ public static void main( final String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java Mon Apr 12 19:44:10 2010
@@ -0,0 +1,38 @@
+package org.apache.maven.plugins.mjavadoc.it.moda;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( final String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/test/java/org/apache/maven/plugins/mjavadoc/it/moda/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/pom.xml?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/pom.xml Mon Apr 12 19:44:10 2010
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>MJAVADOC-280-4-projects</artifactId>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>MJAVADOC-280-4-modB</artifactId>
+ <name>MJAVADOC-280-4-modB</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java Mon Apr 12 19:44:10 2010
@@ -0,0 +1,18 @@
+package org.apache.maven.plugins.mjavadoc.it.modb;
+
+/**
+ * Hello world!
+ *
+ * @.foo A 1st custom javadoc tag.
+ * @author Me
+ * @version 1st
+ * @.bar A 2nd custom javadoc tag.
+ * @see String#startsWith(String)
+ */
+public class App
+{
+ public static void main( final String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java Mon Apr 12 19:44:10 2010
@@ -0,0 +1,38 @@
+package org.apache.maven.plugins.mjavadoc.it.modb;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( final String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/test/java/org/apache/maven/plugins/mjavadoc/it/modb/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml Mon Apr 12 19:44:10 2010
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-4-projects</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>MJAVADOC-280-4-modA</module>
+ <module>MJAVADOC-280-4-modB</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <!-- <version>2.6.2-SNAPSHOT</version> -->
+ <version>@pom.version@</version>
+ <configuration>
+ <tags>
+ <tag><name>.foo</name><placement>optm</placement><head>Foo:</head></tag>
+ <tag><name>author</name></tag>
+ <tag><name>version</name></tag>
+ <tag><name>.bar</name><placement>tcmf</placement><head>Bar:</head></tag>
+ <tag><name>see</name></tag>
+ </tags>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>javadoc-resource-jars</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resource-bundle</goal>
+ <goal>test-resource-bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/MJAVADOC-280-4-projects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml Mon Apr 12 19:44:10 2010
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>MJAVADOC-280-4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>build-projects</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <pom>MJAVADOC-280-4-projects/pom.xml</pom>
+ <goals>
+ <goal>clean</goal>
+ <goal>install</goal>
+ </goals>
+ <streamLogs>true</streamLogs>
+ <suppressSummaries>true</suppressSummaries>
+ <debug>true</debug>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <pom>MJAVADOC-280-4-distro/pom.xml</pom>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ </goals>
+ <streamLogs>true</streamLogs>
+ <suppressSummaries>true</suppressSummaries>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh?rev=933380&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh Mon Apr 12 19:44:10 2010
@@ -0,0 +1,32 @@
+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;
Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-280-4/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Re: svn commit: r933380 [1/3] - in /maven/plugins/trunk/maven-javadoc-plugin:
./ src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/ src/it/MJAVADOC-280-3/ src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/
src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/ src/it/MJAVADOC-280...
Posted by John Casey <jd...@commonjava.org>.
Yup was thinking about that too. I'll have to go revamp the @since
versions, but I think it's definitely a good idea.
-john
On 4/12/10 3:52 PM, Benjamin Bentmann wrote:
> Hi John,
>
>> Author: jdcasey
>> Date: Mon Apr 12 19:44:10 2010
>> New Revision: 933380
>>
>> URL: http://svn.apache.org/viewvc?rev=933380&view=rev
>> Log:
>> [MJAVADOC-280] Fixing IT from previous work, adding support for
>> javadoc-resource bundles that allow non-source javadoc configs and
>> resources to be aggregated via dependencies, and added tests for this
>> new support.
>
> Given the amount of code that was changed, the new parameters that were
> added, I wonder if the next plugin version shouldn't be 2.7 instead of
> 2.6.2?
>
>
> Benjamin
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r933380 [1/3] - in /maven/plugins/trunk/maven-javadoc-plugin:
./ src/it/MJAVADOC-280-2/MJAVADOC-280-2-distro/ src/it/MJAVADOC-280-3/ src/it/MJAVADOC-280-3/MJAVADOC-280-3-distro/
src/it/MJAVADOC-280-3/MJAVADOC-280-3-modA/ src/it/MJAVADOC-280...
Posted by Benjamin Bentmann <be...@udo.edu>.
Hi John,
> Author: jdcasey
> Date: Mon Apr 12 19:44:10 2010
> New Revision: 933380
>
> URL: http://svn.apache.org/viewvc?rev=933380&view=rev
> Log:
> [MJAVADOC-280] Fixing IT from previous work, adding support for javadoc-resource bundles that allow non-source javadoc configs and resources to be aggregated via dependencies, and added tests for this new support.
Given the amount of code that was changed, the new parameters that were
added, I wonder if the next plugin version shouldn't be 2.7 instead of
2.6.2?
Benjamin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org