From fd8ee555d910f7ccf76e135840bdea7a9ada6f7d Mon Sep 17 00:00:00 2001
From: skygo <skygo@unknown>
Date: Fri, 24 Aug 2012 22:02:34 +0000
Subject: [PATCH] make report 3.0 style  upgrade several plugin version:   
 pmd,findbugs,jxr remove cobertura and try jacoco

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1377135 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-modules/pom.xml | 294 ++++++++++++++++++++++------------------
 1 file changed, 162 insertions(+), 132 deletions(-)

diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index 846ab27e6..4e4711d35 100644
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -1,22 +1,22 @@
 <?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
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~  http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
+~ Licensed to the Apache Software Foundation (ASF) under one
+~ or more contributor license agreements.  See the NOTICE file
+~ distributed with this work for additional information
+~ regarding copyright ownership.  The ASF licenses this file
+~ to you under the Apache License, Version 2.0 (the
+~ "License"); you may not use this file except in compliance
+~ with the License.  You may obtain a copy of the License at
+~
+~  http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ 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/maven-v4_0_0.xsd">
   <parent>
     <artifactId>archiva</artifactId>
@@ -36,133 +36,163 @@
     <module>metadata</module>
     <module>plugins</module>
   </modules>
-
-  <reporting>
-    <plugins>
-      <!-- No need for the standard project reports -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.5</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>index</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <!-- Disabled - not working
+  <build>
+    <plugins>    
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.2</version>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.5.9.201207300726</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
-      -->
-      <!-- Disabled - not currently being used to correct errors
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.1</version>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.1</version>
         <configuration>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <configLocation>config/maven_checks.xml</configLocation>
-          <!- - TODO: enable when archiva-build-resources is active (released?)
-          <configLocation>checkstyle.xml</configLocation>
-          <headerLocation>header.txt</headerLocation>
-            - ->
-        </configuration>
-      </plugin>
-      -->
-      <!-- TODO: OOME
+          <reportPlugins>
+            <!-- jxr first -->
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jxr-plugin</artifactId>
+              <version>2.3</version>
+              <configuration>
+                <aggregate>true</aggregate>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-checkstyle-plugin</artifactId>
+              <version>2.9.1</version>
+              <configuration>
+                <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                <configLocation>config/maven_checks.xml</configLocation>
+                <reportSets>
+                  <report>checkstyle</report>
+                </reportSets>
+              </configuration>
+            </plugin>
+            <plugin>
+              <!-- No need for the standard project reports -->
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <version>2.5</version>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>index</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            <!-- cobertura Disabled - not working  try jacoco-->
+            <!-- cobertura not working wll with jdk7 -->
+            <plugin>
+              <groupId>org.jacoco</groupId>
+              <artifactId>jacoco-maven-plugin</artifactId>
+              <version>0.5.9.201207300726</version>
+            </plugin>
+            <!-- -->
+            <!-- TODO: OOME 1.1.1 check newer version-->
             <plugin>
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>findbugs-maven-plugin</artifactId>
-              <version>1.1.1</version>
+              <version>2.5.2</version>
             </plugin>
-      -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
-        <configuration>
-          <source>1.5</source>
-          <useStandardDocletOptions>true</useStandardDocletOptions>
-          <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
-          <docletArtifact>
-            <groupId>gr.spinellis</groupId>
-            <artifactId>UmlGraph</artifactId>
-            <version>4.6</version>
-          </docletArtifact>
-          <additionalparam>
-            -inferrel -inferdep -quiet -hide java.*
-            -collpackages java.util.* -qualify
-            -postfixpackage -nodefontsize 9
-            -nodefontpackagesize 7
-          </additionalparam>
-          <links>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-            <link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
-            <link>http://commons.apache.org/dbcp/apidocs/</link>
-            <link>http://commons.apache.org/fileupload/apidocs/</link>
-            <link>http://commons.apache.org/httpclient/apidocs/</link>
-            <link>http://commons.apache.org/logging/apidocs/</link>
-            <link>http://commons.apache.org/pool/apidocs/</link>
-            <link>http://junit.sourceforge.net/javadoc/</link>
-            <link>http://logging.apache.org/log4j/1.2/apidocs/</link>
-            <link>http://jakarta.apache.org/regexp/apidocs/</link>
-            <link>http://velocity.apache.org/engine/releases/velocity-1.5/apidocs/</link>
-          </links>
-          <linksource>true</linksource>
-          <show>private</show>
-          <tags>
-            <tag>
-              <name>todo</name>
-              <placement>a</placement>
-              <head>To Do:</head>
-            </tag>
-          </tags>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <!-- Don't need tests -->
-              <report>aggregate</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-        <inherited>false</inherited>
-      </plugin>
-      <!-- TODO: choose appropriate rulesets
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <targetJdk>1.5</targetJdk>
+            
+            
+            <!-- -->
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>taglist-maven-plugin</artifactId>
+              <version>2.4</version>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.8.1</version>
+              <configuration>
+                <source>1.5</source>
+                <useStandardDocletOptions>true</useStandardDocletOptions>
+                <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
+                <docletArtifact>
+                  <groupId>gr.spinellis</groupId>
+                  <artifactId>UmlGraph</artifactId>
+                  <version>4.6</version>
+                </docletArtifact>
+                <additionalparam>
+                  -inferrel -inferdep -quiet -hide java.*
+                  -collpackages java.util.* -qualify
+                  -postfixpackage -nodefontsize 9
+                  -nodefontpackagesize 7
+                </additionalparam>
+                <links>
+                  <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+                  <link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
+                  <link>http://commons.apache.org/dbcp/apidocs/</link>
+                  <link>http://commons.apache.org/fileupload/apidocs/</link>
+                  <link>http://commons.apache.org/httpclient/apidocs/</link>
+                  <link>http://commons.apache.org/logging/apidocs/</link>
+                  <link>http://commons.apache.org/pool/apidocs/</link>
+                  <link>http://junit.sourceforge.net/javadoc/</link>
+                  <link>http://logging.apache.org/log4j/1.2/apidocs/</link>
+                  <link>http://jakarta.apache.org/regexp/apidocs/</link>
+                  <link>http://velocity.apache.org/engine/releases/velocity-1.5/apidocs/</link>
+                </links>
+                <linksource>true</linksource>
+                <show>private</show>
+                <tags>
+                  <tag>
+                    <name>todo</name>
+                    <placement>a</placement>
+                    <head>To Do:</head>
+                  </tag>
+                </tags>
+              </configuration>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <!-- Don't need tests -->
+                    <report>aggregate</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+              <!-- <inherited>false</inherited> skygo failing-->
+            </plugin>
+         
+            <!-- TODO: choose appropriate rulesets -->
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-pmd-plugin</artifactId>
+              <version>2.7.1</version>
+              <configuration>
+                <targetJdk>1.5</targetJdk>
+              </configuration>
+            </plugin>
+            <!-- -->
+            <!-- Not being checked
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>clirr-maven-plugin</artifactId>
+            </plugin>
+            -->
+          </reportPlugins>
         </configuration>
       </plugin>
-      -->
-      <!-- Not being checked
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-      </plugin>
-      -->
     </plugins>
-  </reporting>
+  </build>
 
   <distributionManagement>
     <site>
-- 
2.39.5