Author: bimargulies
Date: Tue Aug 23 18:46:03 2011
New Revision: 1160846

URL: http://svn.apache.org/viewvc?rev=1160846&view=rev
Log:
[JXR-91] Javadoc link generation not working when using the 'reportPlugins' 
parameter of the site plugin instead of the 'reporting' section of the pom.
o add integration test. It's all working for me.

Added:
    maven/jxr/trunk/maven-jxr-plugin/src/it/new-site-config/
      - copied from r1160086, 
maven/jxr/trunk/maven-jxr-plugin/src/it/simple-project/
Modified:
    maven/jxr/trunk/maven-jxr-plugin/src/it/new-site-config/pom.xml

Modified: maven/jxr/trunk/maven-jxr-plugin/src/it/new-site-config/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/it/new-site-config/pom.xml?rev=1160846&r1=1160086&r2=1160846&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/src/it/new-site-config/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/src/it/new-site-config/pom.xml Tue Aug 23 
18:46:03 2011
@@ -23,7 +23,7 @@ under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.jxr.it</groupId>
-  <artifactId>simple-project</artifactId>
+  <artifactId>new-site-config</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
@@ -38,30 +38,28 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>@pom.version@</version>
-      </plugin>    
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <version>@sitePluginVersion@</version>
+        <configuration>
+          <excludeDefaults>true</excludeDefaults>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jxr-plugin</artifactId>
+              <version>@pom.version@</version>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.8</version>
+            </plugin>
+          </reportPlugins>
+        </configuration>
       </plugin>
     </plugins>
   </build>
-
-  <reporting>
-    <excludeDefaults>true</excludeDefaults>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>@pom.version@</version>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>


Reply via email to