You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2011/07/11 03:39:50 UTC
svn commit: r1145008 - in /maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate:
p2/src/main/java/org/apache/maven/jxr/it2/App.java
p2/src/main/java/org/apache/maven/jxr/it2/App2.java pom.xml
Author: bimargulies
Date: Mon Jul 11 01:39:50 2011
New Revision: 1145008
URL: http://svn.apache.org/viewvc?rev=1145008&view=rev
Log:
JXR-88: jxr:aggregate and jxr:test-aggregate
o fix up test case, turn on javadoc. There's a lot still to be tested in this vicinity.
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/pom.xml
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java?rev=1145008&r1=1145007&r2=1145008&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App.java Mon Jul 11 01:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.it;
+package org.apache.maven.jxr.it2;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java
URL: http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java?rev=1145008&r1=1145007&r2=1145008&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/aggregate/p2/src/main/java/org/apache/maven/jxr/it2/App2.java Mon Jul 11 01:39:50 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.jxr.it;
+package org.apache.maven.jxr.it2;
/*
* Licensed to the Apache Software Foundation (ASF) under one
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=1145008&r1=1145007&r2=1145008&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 Mon Jul 11 01:39:50 2011
@@ -57,7 +57,21 @@ under the License.
<phase>site</phase>
</execution>
</executions>
- </plugin>
+ </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>
+ </goals>
+ <phase>site</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -77,7 +91,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>@pom.version@</version>
+ <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>