Author: bimargulies
Date: Tue Aug 23 22:34:20 2011
New Revision: 1160911
URL: http://svn.apache.org/viewvc?rev=1160911&view=rev
Log:
[JXR-93] aggregate goal creates blank top-level report
o sort out the its. the aggregate it now just uses reportSets. The
mixed-plugin-report uses both
build and reportSets.
o fix the doc for aggregation, the right way, this time.
Added:
maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/
- copied from r1160086, maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/
maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/verify.groovy
- copied unchanged from r1160901,
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy
maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p1/pom.xml
maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p2/pom.xml
maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
maven/jxr/trunk/maven-jxr-plugin/src/site/apt/examples/aggregate.apt.vm
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml?rev=1160911&r1=1160910&r2=1160911&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml Tue Aug 23
22:34:20 2011
@@ -1,5 +1,4 @@
<?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
@@ -18,87 +17,69 @@ KIND, either express or implied. See th
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.jxr.it</groupId>
- <artifactId>aggregate</artifactId>
- <version>1-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>aggregate</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <jxr-plugin-version>@pom.version@</jxr-plugin-version>
- <site-plugin-version>@sitePluginVersion@</site-plugin-version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>${jxr-plugin-version}</version>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals><goal>aggregate</goal><goal>test-aggregate</goal></goals>
- <phase>site</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- <goal>test-aggregate</goal>
- </goals>
- <phase>site</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>${site-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>p1</module>
- <module>p2</module>
- </modules>
-
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>${jxr-plugin-version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- </plugins>
- </reporting>
+<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.jxr.it</groupId>
+ <artifactId>aggregate</artifactId>
+ <version>1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>aggregate</name>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <jxr-plugin-version>@pom.version@</jxr-plugin-version>
+ <site-plugin-version>@sitePluginVersion@</site-plugin-version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${site-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>p1</module>
+ <module>p2</module>
+ </modules>
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>${jxr-plugin-version}</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy?rev=1160911&r1=1160910&r2=1160911&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/verify.groovy Tue Aug 23
22:34:20 2011
@@ -40,5 +40,5 @@ assert content.contains( 'App2.html' );
content = new File( basedir,
'target/site/xref/org/apache/maven/jxr/it2/App.html' ).text;
assert content.contains( 'App2.html' );
content = new File( basedir, 'target/site/xref/index.html' ).text;
-assert content.contains( '<!-- this is a JXR report set -->' );
+assert content.contains( 'this is a JXR report set' );
return true;
\ No newline at end of file
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p1/pom.xml?rev=1160911&r1=1160086&r2=1160911&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p1/pom.xml
(original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p1/pom.xml Tue
Aug 23 22:34:20 2011
@@ -23,14 +23,14 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.jxr.it</groupId>
- <artifactId>agg-p1</artifactId>
+ <artifactId>mixed-p1</artifactId>
<parent>
<groupId>org.apache.maven.jxr.it</groupId>
- <artifactId>aggregate</artifactId>
+ <artifactId>mixed-plugin-report</artifactId>
<version>1-SNAPSHOT</version>
</parent>
- <name>one aggregate module</name>
+ <name>mixed-p1</name>
<url>http://maven.apache.org</url>
</project>
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p2/pom.xml?rev=1160911&r1=1160086&r2=1160911&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p2/pom.xml
(original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/p2/pom.xml Tue
Aug 23 22:34:20 2011
@@ -23,14 +23,14 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.jxr.it</groupId>
- <artifactId>agg-p2</artifactId>
+ <artifactId>mixed-p2</artifactId>
<parent>
<groupId>org.apache.maven.jxr.it</groupId>
- <artifactId>aggregate</artifactId>
+ <artifactId>mixed-plugin-report</artifactId>
<version>1-SNAPSHOT</version>
</parent>
- <name>agg-p2</name>
+ <name>mixed-p2</name>
<url>http://maven.apache.org</url>
</project>
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml?rev=1160911&r1=1160086&r2=1160911&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml
(original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/mixed-plugin-report/pom.xml Tue Aug
23 22:34:20 2011
@@ -23,9 +23,10 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.jxr.it</groupId>
- <artifactId>aggregate</artifactId>
+ <artifactId>mixed-plugin-report</artifactId>
<version>1-SNAPSHOT</version>
<packaging>pom</packaging>
+ <description>Use both execute and executeReport in one pom. Verifies that at
least one produces plausible results</description>
<name>aggregate</name>
<url>http://maven.apache.org</url>
@@ -50,13 +51,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>${jxr-plugin-version}</version>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals><goal>aggregate</goal><goal>test-aggregate</goal></goals>
- <phase>site</phase>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals><goal>aggregate</goal><goal>test-aggregate</goal></goals>
+ <phase>site</phase>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/site/apt/examples/aggregate.apt.vm
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/site/apt/examples/aggregate.apt.vm?rev=1160911&r1=1160910&r2=1160911&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/site/apt/examples/aggregate.apt.vm
(original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/site/apt/examples/aggregate.apt.vm Tue
Aug 23 22:34:20 2011
@@ -69,30 +69,21 @@ Project
+-----+
<project>
...
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- <goal>test-aggregate</goal></goals>
- <phase>site</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>${project.version}</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
</plugins>
...
