You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/09/28 01:18:59 UTC

svn commit: r819426 - in /maven/plugins/trunk/maven-javadoc-plugin/src: it/MJAVADOC-181/ it/MJAVADOC-181/application/ it/MJAVADOC-181/library/ it/MJAVADOC-257/ it/MJAVADOC-259/ main/java/org/apache/maven/plugin/javadoc/

Author: olamy
Date: Sun Sep 27 23:18:59 2009
New Revision: 819426

URL: http://svn.apache.org/viewvc?rev=819426&view=rev
Log:
exclude default reports for its which called site to have a faster build.

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/pom.xml
    maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/pom.xml
    maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml
    maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
    maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/pom.xml?rev=819426&r1=819425&r2=819426&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/pom.xml Sun Sep 27 23:18:59 2009
@@ -37,19 +37,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-
-        <reportSets>
-          <reportSet>
-            <configuration>
-              <groups>
-                <group>
-                  <title>Main</title>
-                  <packages>app</packages>
-                </group>
-              </groups>
-            </configuration>
-          </reportSet>
-        </reportSets>
+        <version>@pom.version@</version>
+        <configuration>
+          <groups>
+            <group>
+              <title>Main</title>
+              <packages>app</packages>
+            </group>
+          </groups>
+        </configuration>        
       </plugin>
     </plugins>
   </reporting>

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/pom.xml?rev=819426&r1=819425&r2=819426&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/pom.xml Sun Sep 27 23:18:59 2009
@@ -42,24 +42,20 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-
-        <reportSets>
-          <reportSet>
-            <configuration>
-              <aggregate>true</aggregate>
-              <groups>
-                <group>
-                  <title>First Module</title>
-                  <packages>aaa</packages>
-                </group>
-                <group>
-                  <title>Second Module</title>
-                  <packages>bbb</packages>
-                </group>
-              </groups>
-            </configuration>
-          </reportSet>
-        </reportSets>
+        <version>@pom.version@</version>
+        <configuration>
+          <aggregate>true</aggregate>
+          <groups>
+            <group>
+              <title>First Module</title>
+              <packages>aaa</packages>
+            </group>
+            <group>
+              <title>Second Module</title>
+              <packages>bbb</packages>
+            </group>
+          </groups>
+        </configuration>        
       </plugin>
     </plugins>
   </reporting>

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml?rev=819426&r1=819425&r2=819426&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml Sun Sep 27 23:18:59 2009
@@ -51,14 +51,10 @@
   </build>
 
   <reporting>
+    <excludeDefaults>true</excludeDefaults>
     <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>@pom.version@</version>
         <reportSets>
@@ -72,7 +68,6 @@
                 <tag><name>see</name></tag>
               </tags>
             </configuration>
-
             <reports>
               <report>javadoc</report>
             </reports>

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml?rev=819426&r1=819425&r2=819426&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml Sun Sep 27 23:18:59 2009
@@ -70,14 +70,10 @@
   </build>
 
   <reporting>
+    <excludeDefaults>true</excludeDefaults>
     <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>@pom.version@</version>
         <reportSets>

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml?rev=819426&r1=819425&r2=819426&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-259/pom.xml Sun Sep 27 23:18:59 2009
@@ -61,6 +61,7 @@
   </build>
 
   <reporting>
+    <excludeDefaults>true</excludeDefaults>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=819426&r1=819425&r2=819426&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Sun Sep 27 23:18:59 2009
@@ -212,6 +212,10 @@
 
             canGenerate = canGenerateReport( files );
         }
+        if ( getLog().isDebugEnabled() )
+        {
+            getLog().debug( " canGenerateReport " + canGenerate + " project " + this.project );
+        }
         return canGenerate;
     }