You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by Gary Gregory <ga...@gmail.com> on 2014/10/05 01:04:20 UTC
Fwd: [1/4] git commit: Normalize reporting sections in poms.
Music to my ears :-)
Gary
---------- Forwarded message ----------
From: <ma...@apache.org>
Date: Sat, Oct 4, 2014 at 6:38 PM
Subject: [1/4] git commit: Normalize reporting sections in poms.
To: commits@logging.apache.org
Repository: logging-log4j2
Updated Branches:
refs/heads/master ef23c80d7 -> 1c488bf42
Normalize reporting sections in poms.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit:
http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6d6789f7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6d6789f7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6d6789f7
Branch: refs/heads/master
Commit: 6d6789f7f1e7ecdd8d748cd1ddd835aabec47296
Parents: ef23c80
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 17:20:43 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 17:20:43 2014 -0500
----------------------------------------------------------------------
log4j-1.2-api/pom.xml | 13 +----
log4j-api/pom.xml | 18 ++-----
log4j-core/pom.xml | 16 +-----
log4j-flume-ng/pom.xml | 15 +-----
log4j-iostreams/pom.xml | 16 ++----
log4j-jcl/pom.xml | 19 ++------
log4j-jmx-gui/pom.xml | 14 +-----
log4j-jul/pom.xml | 110 +++++++++++++++++++++++++++++++++++++++++-
log4j-nosql/pom.xml | 24 ++++++---
log4j-slf4j-impl/pom.xml | 14 +-----
log4j-taglib/pom.xml | 17 ++-----
log4j-to-slf4j/pom.xml | 14 +-----
log4j-web/pom.xml | 21 ++++++--
13 files changed, 171 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-1.2-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index a9496ce..2a98108 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -140,7 +140,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
@@ -196,17 +196,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index a81117d..9457e78 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -153,13 +153,16 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
- project -->
+ project -->
<detectOfflineLinks>false</detectOfflineLinks>
<linksource>true</linksource>
+ <links>
+ <link>http://www.osgi.org/javadoc/r4v43/core/</link>
+ </links>
</configuration>
<reportSets>
<reportSet>
@@ -209,17 +212,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-core/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index bce06bf..570fb08 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -353,11 +353,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
- project -->
+ project -->
<detectOfflineLinks>false</detectOfflineLinks>
<linksource>true</linksource>
<links>
@@ -435,18 +435,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <!-- TODO: convert this report plugin into a release profile
and disable relevant unit tests -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-flume-ng/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 4fe0fe8..da8ade9 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -191,11 +191,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
- project -->
+ project -->
<detectOfflineLinks>false</detectOfflineLinks>
<linksource>true</linksource>
</configuration>
@@ -247,17 +247,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-iostreams/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index 367783d..d7e7f64 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -117,12 +117,13 @@
</reportSets>
<configuration>
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ <useJql>true</useJql>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.7</version>
+ <version>${checkstyle.plugin.version}</version>
<configuration>
<!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
<configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
@@ -137,7 +138,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
@@ -193,17 +194,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-jcl/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 6aae66a..116d37a 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -127,10 +127,9 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom>Copyright © {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved. Apache Logging,
- Apache Log4j, Log4j, Apache, the Apache feather logo, and the
- Apache Logging project logo are trademarks of The Apache
Software Foundation.
- </bottom>
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
+ and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
project -->
<detectOfflineLinks>false</detectOfflineLinks>
@@ -184,18 +183,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
-
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-jmx-gui/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index b0cf26d..e65b056 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -99,6 +99,7 @@
</reportSets>
<configuration>
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ <useJql>true</useJql>
</configuration>
</plugin>
<plugin>
@@ -119,7 +120,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
@@ -175,17 +176,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
<profiles>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-jul/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index 7ac483b..5b79f6f 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -63,6 +63,21 @@
<build>
<plugins>
+ <!-- Include the standard NOTICE and LICENSE -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -74,5 +89,98 @@
</plugin>
</plugins>
</build>
-
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>${changes.plugin.version}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ <configuration>
+
<!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
+ <configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
+
<suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ <propertyExpansion>basedir=${basedir}</propertyExpansion>
+
<propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.plugin.version}</version>
+ <configuration>
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
+ and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
+ <!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
+ project -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <linksource>true</linksource>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.plugin.version}</version>
+ <configuration>
+ <fork>true</fork>
+ <jvmArgs>-Duser.language=en</jvmArgs>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+
<excludeFilterFile>${log4jParentDir}/findbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>${jxr.plugin.version}</version>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <reports>
+ <report>jxr</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd.plugin.version}</version>
+ <configuration>
+ <targetJdk>${maven.compile.target}</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-nosql/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-nosql/pom.xml b/log4j-nosql/pom.xml
index 91263c4..812326b 100644
--- a/log4j-nosql/pom.xml
+++ b/log4j-nosql/pom.xml
@@ -81,6 +81,22 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>${changes.plugin.version}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<configuration>
@@ -97,17 +113,13 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
- project -->
+ project -->
<detectOfflineLinks>false</detectOfflineLinks>
<linksource>true</linksource>
- <links>
- <link>http://docs.oracle.com/javaee/6/api/</link>
- <link>http://www.osgi.org/javadoc/r4v43/core/</link>
- </links>
</configuration>
<reportSets>
<reportSet>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-slf4j-impl/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index b3ae99d..a8221d0 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -166,6 +166,7 @@
</reportSets>
<configuration>
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ <useJql>true</useJql>
</configuration>
</plugin>
<plugin>
@@ -186,7 +187,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
@@ -242,17 +243,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-taglib/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index 40470b9..8c142ba 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -126,13 +126,15 @@
</reportSets>
<configuration>
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ <useJql>true</useJql>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.7</version>
+ <version>${checkstyle.plugin.version}</version>
<configuration>
+
<!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
<configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
<suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
<enableRulesSummary>false</enableRulesSummary>
@@ -145,7 +147,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
@@ -202,17 +204,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<version>2.4</version>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-to-slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index 0516f13..e4e85f1 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -111,6 +111,7 @@
</reportSets>
<configuration>
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ <useJql>true</useJql>
</configuration>
</plugin>
<plugin>
@@ -131,7 +132,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
@@ -187,17 +188,6 @@
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.plugin.version}</version>
- <reportSets>
- <reportSet>
- <!-- Disabled as it makes the site build very slow and causes
the performance unit test to fail -->
- <reports />
- </reportSet>
- </reportSets>
- </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d6789f7/log4j-web/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index d15206a..028c1ed 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -94,6 +94,22 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>${changes.plugin.version}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<configuration>
@@ -110,16 +126,15 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<configuration>
- <bottom> <![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
+ <bottom><![CDATA[<p align="center">Copyright ©
{inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br />
Apache Logging, Apache Log4j, Log4j, Apache, the Apache
feather logo, the Apache Logging project logo,
and the Apache Log4j logo are trademarks of The Apache
Software Foundation.</p>]]></bottom>
<!-- module link generation is completely broken in the javadoc
plugin for a multi-module non-aggregating
- project -->
+ project -->
<detectOfflineLinks>false</detectOfflineLinks>
<linksource>true</linksource>
<links>
<link>http://docs.oracle.com/javaee/6/api/</link>
- <link>http://www.osgi.org/javadoc/r4v43/core/</link>
</links>
</configuration>
<reportSets>
--
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory