JAMES-2511 Reporting should not be declared in configuration

But in a distinct reporting section of pom.xml


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/71b8b80d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/71b8b80d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/71b8b80d

Branch: refs/heads/master
Commit: 71b8b80d17b7930c8e5615e86ca7951bc19d46a4
Parents: 8ae821a
Author: benwa <[email protected]>
Authored: Wed Aug 1 11:32:22 2018 +0700
Committer: benwa <[email protected]>
Committed: Wed Aug 1 18:04:00 2018 +0700

----------------------------------------------------------------------
 pom.xml | 273 +++++++++++++++--------------------------------------------
 1 file changed, 69 insertions(+), 204 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/71b8b80d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3ef1c08..8334d0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3087,31 +3087,6 @@
                 <configuration>
                     <inputEncoding>UTF-8</inputEncoding>
                     <outputEncoding>UTF-8</outputEncoding>
-                    <reportPlugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            
<artifactId>maven-project-info-reports-plugin</artifactId>
-                            <reportSets>
-                                <reportSet>
-                                    <reports>
-                                        <report>license</report>
-                                        <report>project-team</report>
-                                    </reports>
-                                </reportSet>
-                            </reportSets>
-                        </plugin>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-javadoc-plugin</artifactId>
-                            <reportSets>
-                                <reportSet>
-                                    <reports>
-                                        <report>aggregate</report>
-                                    </reports>
-                                </reportSet>
-                            </reportSets>
-                        </plugin>
-                    </reportPlugins>
                 </configuration>
 
                 <dependencies>
@@ -3202,185 +3177,6 @@
                             <artifactId>maven-site-plugin</artifactId>
                             <configuration>
                                 
<siteDirectory>${basedir}/src/reporting-site</siteDirectory>
-                                <reportPlugins combine.children="append">
-                                    <!-- Order matters. First 
project-info-reports, second jxr. -->
-                                    <plugin>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-project-info-reports-plugin</artifactId>
-                                        <reports>
-                                            <report>dependencies</report>
-                                            
<report>dependency-management</report>
-                                            
<report>dependency-convergence</report>
-                                            
<report>distribution-management</report>
-                                            <report>index</report>
-                                            <report>issue-tracking</report>
-                                            <report>license</report>
-                                            <report>mailing-list</report>
-                                            <report>modules</report>
-                                            <report>plugin-management</report>
-                                            <report>plugins</report>
-                                            <report>project-team</report>
-                                            <report>scm</report>
-                                            <report>summary</report>
-                                        </reports>
-                                    </plugin>
-                                    <plugin>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-jxr-plugin</artifactId>
-                                        <configuration>
-                                            <aggregate>true</aggregate>
-                                        </configuration>
-                                    </plugin>
-                                    <plugin>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-dependency-plugin</artifactId>
-                                    </plugin>
-                                    <plugin>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-surefire-report-plugin</artifactId>
-                                        <configuration>
-                                            <aggregate>true</aggregate>
-                                        </configuration>
-                                    </plugin>
-                                    <plugin>
-                                        <groupId>org.codehaus.mojo</groupId>
-                                        
<artifactId>cobertura-maven-plugin</artifactId>
-                                        <configuration>
-                                            <aggregate>true</aggregate>
-                                            <!--
-                                                Whether to remove GPL licensed 
files from the generated report. This is required to distribute
-                                                the report as part of a 
distribution, which is licensed under the ASL, or a similar license,
-                                                which is incompatible with the 
GPL
-                                            -->
-                                            <omitGplFiles>true</omitGplFiles>
-                                        </configuration>
-                                    </plugin>
-                                    <plugin>
-                                        <groupId>org.apache.rat</groupId>
-                                        
<artifactId>apache-rat-plugin</artifactId>
-                                        <configuration>
-                                            <excludes>
-                                                <exclude>BUILDING.*</exclude>
-                                                <exclude>HOWTO.*</exclude>
-                                                <exclude>HOWTO_*</exclude>
-                                                <exclude>LICENSE.*</exclude>
-                                                <exclude>NOTICE.*</exclude>
-                                                <!-- site resources -->
-                                                
<exclude>src/site/resources/download*.cgi</exclude>
-                                                
<exclude>src/site/resources/downloads/formatting.xml</exclude>
-                                                
<exclude>src/site/resources/js/galleria/**</exclude>
-                                                
<exclude>src/site/resources/model-eclipse-modeler/*</exclude>
-                                                
<exclude>src/site/resources/robots.txt</exclude>
-                                                <!-- Generated by Maven -->
-                                                
<exclude>release.properties</exclude>
-                                                <exclude>dist/**/*</exclude>
-                                                <exclude>**/derby.log</exclude>
-                                                <!-- Eclipse -->
-                                                <exclude>**/.*</exclude>
-                                                <exclude>.*/**/*</exclude>
-                                                <!-- Schemas for offline use 
-->
-                                                
<exclude>**/META-INF/XSD/activemq-core-*.xsd</exclude>
-                                                
<exclude>**/META-INF/XSD/camel-spring-*.xsd</exclude>
-                                                
<exclude>**/META-INF/XSD/spring-beans-*.xsd</exclude>
-                                            </excludes>
-                                        </configuration>
-                                    </plugin>
-                                    <plugin>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-pmd-plugin</artifactId>
-                                        <configuration>
-                                            <aggregate>true</aggregate>
-                                            
<targetJdk>${target.jdk}</targetJdk>
-                                            <rulesets>
-                                                
<ruleset>/rulesets/basic.xml</ruleset>
-                                                
<ruleset>/rulesets/unusedcode.xml</ruleset>
-                                                
<ruleset>/rulesets/imports.xml</ruleset>
-                                            </rulesets>
-                                            <format>xml</format>
-                                            <linkXref>true</linkXref>
-                                            
<sourceEncoding>utf-8</sourceEncoding>
-                                            <minimumTokens>100</minimumTokens>
-                                        </configuration>
-                                    </plugin>
-                                    <plugin>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-javadoc-plugin</artifactId>
-                                        <configuration>
-                                            <linksource>true</linksource>
-                                            <maxmemory>1g</maxmemory>
-                                            <minmemory>256m</minmemory>
-                                            <source>${target.jdk}</source>
-                                            <tags>
-                                                <tag>
-                                                    <name>note</name>
-                                                    <placement>a</placement>
-                                                    <head>NOTE</head>
-                                                </tag>
-                                                <tag>
-                                                    <name>todo</name>
-                                                    <placement>a</placement>
-                                                    <head>TODO</head>
-                                                </tag>
-                                                <tag>
-                                                    <name>warning</name>
-                                                    <placement>a</placement>
-                                                    <head>WARNING</head>
-                                                </tag>
-                                            </tags>
-                                        </configuration>
-                                        <reportSets>
-                                            <reportSet>
-                                                <reports>
-                                                    <report>aggregate</report>
-                                                    
<report>test-aggregate</report>
-                                                </reports>
-                                            </reportSet>
-                                        </reportSets>
-                                    </plugin>
-                                    <plugin>
-                                        <groupId>org.codehaus.mojo</groupId>
-                                        
<artifactId>findbugs-maven-plugin</artifactId>
-                                        <configuration>
-                                            <!-- required by dashboard plugin 
and jenkins -->
-                                            <xmlOutput>true</xmlOutput>
-                                            <effort>Max</effort>
-                                            
<findbugsXmlOutput>true</findbugsXmlOutput>
-                                            
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-                                        </configuration>
-                                    </plugin>
-                                    <plugin>
-                                        <groupId>org.codehaus.mojo</groupId>
-                                        
<artifactId>versions-maven-plugin</artifactId>
-                                        <reportSets>
-                                            <reportSet>
-                                                <reports>
-                                                    
<report>dependency-updates-report</report>
-                                                    
<report>plugin-updates-report</report>
-                                                    
<report>property-updates-report</report>
-                                                </reports>
-                                            </reportSet>
-                                        </reportSets>
-                                    </plugin>
-                                    <!--
-                                        <plugin>
-                                        
<groupId>org.apache.maven.plugins</groupId>
-                                        
<artifactId>maven-changes-plugin</artifactId>
-                                        <configuration>
-                                        
<onlyCurrentVersion>true</onlyCurrentVersion>
-                                        <resolutionIds>Fixed</resolutionIds>
-                                        <statusIds>Resolved,Closed</statusIds>
-                                        
<columnNames>Type,Key,Summary,Status,Resolution,Fix Version</columnNames>
-                                        </configuration>
-                                        <reportSets>
-                                        <reportSet>
-                                        <reports>
-                                        <report>jira-report</report>
-                                        </reports>
-                                        </reportSet>
-                                        </reportSets>
-                                        </plugin>
-                                    -->
-                                </reportPlugins>
                             </configuration>
                             <dependencies>
                                 <dependency>
@@ -3435,4 +3231,73 @@
             </build>
         </profile>
     </profiles>
+
+    <reporting>
+        <plugins>
+            <!-- Order matters. First project-info-reports, second jxr. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+            </plugin>
+            <!--
+            See JAMES-2511 basicRuleSet.xml do not exist so when re-enabled 
this plugin failed.
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+            </plugin>
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+            </plugin>
+
+            <!--
+                <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-changes-plugin</artifactId>
+                <configuration>
+                <onlyCurrentVersion>true</onlyCurrentVersion>
+                <resolutionIds>Fixed</resolutionIds>
+                <statusIds>Resolved,Closed</statusIds>
+                <columnNames>Type,Key,Summary,Status,Resolution,Fix 
Version</columnNames>
+                </configuration>
+                <reportSets>
+                <reportSet>
+                <reports>
+                <report>jira-report</report>
+                </reports>
+                </reportSet>
+                </reportSets>
+                </plugin>
+            -->
+        </plugins>
+    </reporting>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to