You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2015/11/13 22:18:26 UTC

svn commit: r1714268 - in /logging/log4net: ReleaseInstructions.txt trunk/pom.xml

Author: bodewig
Date: Fri Nov 13 21:18:26 2015
New Revision: 1714268

URL: http://svn.apache.org/viewvc?rev=1714268&view=rev
Log:
bring back RAT report to site build

Modified:
    logging/log4net/ReleaseInstructions.txt
    logging/log4net/trunk/pom.xml

Modified: logging/log4net/ReleaseInstructions.txt
URL: http://svn.apache.org/viewvc/logging/log4net/ReleaseInstructions.txt?rev=1714268&r1=1714267&r2=1714268&view=diff
==============================================================================
--- logging/log4net/ReleaseInstructions.txt (original)
+++ logging/log4net/ReleaseInstructions.txt Fri Nov 13 21:18:26 2015
@@ -28,7 +28,7 @@ Prereqs
     o Some recent version of a Java runtime environment (Java5 at
       minimum)
 
-    o Apache Maven 2.2.x http://maven.apache.org/
+    o Apache Maven 3.x http://maven.apache.org/
 
       You may want to set some environment variables like Path (to
       include Maven's and NAnt's bin directories), M2_HOME and

Modified: logging/log4net/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4net/trunk/pom.xml?rev=1714268&r1=1714267&r2=1714268&view=diff
==============================================================================
--- logging/log4net/trunk/pom.xml (original)
+++ logging/log4net/trunk/pom.xml Fri Nov 13 21:18:26 2015
@@ -92,33 +92,7 @@
         <artifactId>maven-site-plugin</artifactId>
         <version>3.4</version>
         <configuration>
-
-          <!-- Override default rendering (only required to add a custom footer) -->
-          <!-- This can be removed once <footer> tag is supported in site.xml.  -->
           <templateFile>${basedir}/src/site/site.vm</templateFile>
-          <!-- Configure additional reports on the site -->
-          <reportPlugins>
-            <!-- Project info report -->
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.8</version>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>cim</report>	
-                    <report>scm</report>
-                    <report>dependencies</report>
-                    <report>license</report>
-                    <report>project-team</report>
-                    <report>issue-tracking</report>
-                    <report>mailing-list</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-            </plugin>
-						
-          </reportPlugins>
         </configuration>
       </plugin>
       <plugin>
@@ -150,6 +124,14 @@
 
   <reporting>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.4</version>
+        <configuration>
+          <templateFile>${basedir}/src/site/site.vm</templateFile>
+        </configuration>
+      </plugin>
       <!-- RAT report -->
       <plugin>
         <groupId>org.apache.rat</groupId>
@@ -174,6 +156,33 @@
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>${commons.project-info.version}</version>
+        <!--
+            Unfortunately it does not appear to be possible to override
+            reports configured in a parent POM.
+            See https://jira.codehaus.org/browse/MPIR-241
+            and https://issues.apache.org/jira/browse/MPOM-32
+            So we define here all those reports that are suitable for
+            all components.
+            Components can add extra reports if they wish, but cannot disable any.
+        -->
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>cim</report>	
+              <report>scm</report>
+              <report>dependencies</report>
+              <report>license</report>
+              <report>project-team</report>
+              <report>issue-tracking</report>
+              <report>mailing-list</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
     </plugins>
   </reporting>