Author: lindner
Date: Mon Jan 12 10:24:25 2009
New Revision: 733856

URL: http://svn.apache.org/viewvc?rev=733856&view=rev
Log:
SHINDIG-827 | Patch from Vincent Siveton | Maven Reporting / PMD etc

Modified:
    incubator/shindig/trunk/pom.xml

Modified: incubator/shindig/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=733856&r1=733855&r2=733856&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Mon Jan 12 10:24:25 2009
@@ -409,20 +409,72 @@
 
     <profile>
       <id>reporting</id>
-      <reporting>
+      <modules>
+        <module>java</module>
+      </modules>
+      <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <configuration>
+              <check>
+                <haltOnFailure>false</haltOnFailure>
+                <regexes>
+                  <regex>
+                    <pattern>org.apache.shindig.*</pattern>
+                    <branchRate>90</branchRate>
+                    <lineRate>90</lineRate>
+                  </regex>
+                </regexes>
+              </check>
+              <instrumentation>
+                <includes>
+                  <include>org/apache/shindig/**/*.class</include>
+                </includes>
+              </instrumentation>
+            </configuration>
+            <executions>
+              <execution>
+                <id>clean</id>
+                <phase>pre-site</phase>
+                <goals>
+                  <goal>clean</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>instrument</id>
+                <phase>site</phase>
+                <goals>
+                  <goal>instrument</goal>
+                  <goal>cobertura</goal>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
+        </plugins>
+      </build>
+      <reporting>
+        <!-- ordered alphabetically by owner -->
+        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jxr-plugin</artifactId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>2.2</version>
+            <configuration>
+              
<configLocation>http://svn.apache.org/repos/asf/incubator/shindig/trunk/site/checkstyle.xml</configLocation>
+              <encoding>${project.build.sourceEncoding}</encoding>
+            </configuration>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.5</version>
             <configuration>
+              <source>1.5</source>
+              <target>1.5</target>
+              <encoding>${project.build.sourceEncoding}</encoding>
               <links>
                 <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
                 <link>http://java.sun.com/products/servlet/2.3/javadoc/</link>
@@ -430,19 +482,159 @@
                 <link>http://junit.sourceforge.net/javadoc/</link>
               </links>
             </configuration>
+            <reportSets>
+              <reportSet>
+                <id>non-aggregate</id>
+                <configuration>
+                  <aggregate>false</aggregate>
+                </configuration>
+                <reports>
+                  <report>javadoc</report>
+                  <report>test-javadoc</report>
+                </reports>
+              </reportSet>
+              <reportSet>
+                <id>aggregate</id>
+                <configuration>
+                  <aggregate>true</aggregate>
+                </configuration>
+                <reports>
+                  <report>aggregate</report>
+                  <report>test-aggregate</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jxr-plugin</artifactId>
+            <version>2.1</version>
+            <configuration>
+              <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+              <outputEncoding>${project.build.sourceEncoding}</outputEncoding>
+            </configuration>
+            <reportSets>
+              <reportSet>
+                <id>non-aggregate</id>
+                <configuration>
+                  <aggregate>false</aggregate>
+                </configuration>
+                <reports>
+                  <report>jxr</report>
+                  <report>test-jxr</report>
+                </reports>
+              </reportSet>
+              <reportSet>
+                <id>aggregate</id>
+                <configuration>
+                  <aggregate>true</aggregate>
+                </configuration>
+                <reports>
+                  <report>jxr</report>
+                  <report>test-jxr</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-pmd-plugin</artifactId>
+            <version>2.4</version>
+            <configuration>
+              <targetJdk>1.5</targetJdk>
+              <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
+            </configuration>
+            <reportSets>
+              <reportSet>
+                <id>non-aggregate</id>
+                <configuration>
+                  <aggregate>false</aggregate>
+                </configuration>
+                <reports>
+                  <report>cpd</report>
+                  <report>pmd</report>
+                </reports>
+              </reportSet>
+              <reportSet>
+                <id>aggregate</id>
+                <configuration>
+                  <aggregate>true</aggregate>
+                </configuration>
+                <reports>
+                  <report>cpd</report>
+                  <report>pmd</report>
+                </reports>
+              </reportSet>
+            </reportSets>
           </plugin>
+          
+          <!-- Mojo -->
+          <!--plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>clirr-maven-plugin</artifactId>
+            <version>2.2.2</version>
+          </plugin-->
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>cobertura-maven-plugin</artifactId>
+            <version>2.2</version>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+            <version>1.2</version>
           </plugin>
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
+            <artifactId>jdepend-maven-plugin</artifactId>
+            <version>2.0-beta-2</version>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rat-maven-plugin</artifactId>
+            <version>1.0-alpha-3</version>
+            <configuration>
+              <includes>
+                <include>**/*.java</include>
+              </includes>
+              <excludes>
+                <exclude>**/jsunit/**/*</exclude>
+              </excludes>
+            </configuration>
+         </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
             <artifactId>taglist-maven-plugin</artifactId>
+            <version>2.3</version>
             <configuration>
               <tags>
                 <tag>TODO</tag>
+                <tag>FIXME</tag>
+                <tag>@todo</tag>
+                <tag>@deprecated</tag>
               </tags>
+              <encoding>${project.build.sourceEncoding}</encoding>
             </configuration>
+            <reportSets>
+              <reportSet>
+                <id>non-aggregate</id>
+                <configuration>
+                  <aggregate>false</aggregate>
+                </configuration>
+                <reports>
+                  <report>taglist</report>
+                </reports>
+              </reportSet>
+              <reportSet>
+                <id>aggregate</id>
+                <configuration>
+                  <aggregate>true</aggregate>
+                </configuration>
+                <reports>
+                  <report>taglist</report>
+                </reports>
+              </reportSet>
+            </reportSets>
           </plugin>
         </plugins>
       </reporting>
@@ -684,7 +876,11 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.0-beta-6</version>
+          <version>2.0-beta-7</version>
+          <configuration>
+            <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+            <outputEncoding>${project.build.sourceEncoding}</outputEncoding>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -803,47 +999,12 @@
           <attach>true</attach>
         </configuration>
       </plugin>
-
-      <!-- Mojo -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <configuration>
-          <check>
-            <haltOnFailure>false</haltOnFailure>
-            <regexes>
-              <regex>
-                <pattern>org.apache.shindig.*</pattern>
-                <branchRate>90</branchRate>
-                <lineRate>90</lineRate>
-              </regex>
-            </regexes>
-          </check>
-          <instrumentation>
-            <includes>
-              <include>org/apache/shindig/**/*.class</include>
-            </includes>
-          </instrumentation>
-        </configuration>
-        <executions>
-          <execution>
-            <id>clean</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>instrument</id>
-            <phase>site</phase>
-            <goals>
-              <goal>instrument</goal>
-              <goal>cobertura</goal>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
       </plugin>
+
+      <!-- Mojo -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>rat-maven-plugin</artifactId>
@@ -866,30 +1027,6 @@
       <!-- Maven -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          
<configLocation>http://svn.apache.org/repos/asf/incubator/shindig/trunk/site/checkstyle.xml</configLocation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>2.1</version>
       </plugin>
@@ -898,50 +1035,9 @@
         <artifactId>maven-surefire-report-plugin</artifactId>
         <version>2.4.3</version>
       </plugin>
-
-      <!-- Mojo -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>1.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jdepend-maven-plugin</artifactId>
-        <version>2.0-beta-2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <configuration>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <tags>
-            <tag>TODO</tag>
-            <tag>FIXME</tag>
-            <tag>@todo</tag>
-            <tag>@deprecated</tag>
-          </tags>
-        </configuration>
-      </plugin>
     </plugins>
   </reporting>
 
-
   <!-- ====================================================================== 
-->
   <!-- R E P O S I T O R I E S                                                
-->
   <!-- ====================================================================== 
-->


Reply via email to