You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2012/07/11 22:36:26 UTC
svn commit: r1360385 - in /logging/log4j/log4j2/trunk: api/pom.xml
core/pom.xml jcl-bridge/pom.xml log4j12-api/pom.xml pom.xml
slf4j-impl/pom.xml src/changes/announcement.vm src/site/xdoc/build.xml
src/site/xdoc/index.xml
Author: rgoers
Date: Wed Jul 11 20:36:25 2012
New Revision: 1360385
URL: http://svn.apache.org/viewvc?rev=1360385&view=rev
Log:
documentation updates. Add pmd plugin version to fix warnings
Modified:
logging/log4j/log4j2/trunk/api/pom.xml
logging/log4j/log4j2/trunk/core/pom.xml
logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
logging/log4j/log4j2/trunk/log4j12-api/pom.xml
logging/log4j/log4j2/trunk/pom.xml
logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
logging/log4j/log4j2/trunk/src/changes/announcement.vm
logging/log4j/log4j2/trunk/src/site/xdoc/build.xml
logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
Modified: logging/log4j/log4j2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/pom.xml?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/api/pom.xml Wed Jul 11 20:36:25 2012
@@ -143,6 +143,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd.plugin.version}</version>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
Modified: logging/log4j/log4j2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/pom.xml?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/core/pom.xml Wed Jul 11 20:36:25 2012
@@ -244,6 +244,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd.plugin.version}</version>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
Modified: logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/pom.xml?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/pom.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/pom.xml Wed Jul 11 20:36:25 2012
@@ -155,6 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd.plugin.version}</version>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Wed Jul 11 20:36:25 2012
@@ -151,6 +151,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd.plugin.version}</version>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Wed Jul 11 20:36:25 2012
@@ -31,7 +31,7 @@
<description>Apache Log4j 2</description>
<url>http://logging.apache.org/log4j/2.0/</url>
<issueManagement>
- <system>Jira</system>
+ <system>JIRA</system>
<url>http://issues.apache.org/jira/browse/LOG4J2</url>
</issueManagement>
<ciManagement>
@@ -98,6 +98,7 @@
<osgi.import>*</osgi.import>
<osgi.dynamicImport />
<osgi.private />
+ <pmd.plugin.version>2.7.1</pmd.plugin.version>
<manifestfile>target/osgi/MANIFEST.MF</manifestfile>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
@@ -202,7 +203,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <version>${pmd.plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -427,16 +428,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7.1</version>
<configuration>
<template>announcement.vm</template>
<templateDirectory>src/changes</templateDirectory>
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<outputDirectory>.</outputDirectory>
<announcementFile>RELEASE-NOTES.txt</announcementFile>
- <announcementParameters>
+ <issueManagementSystems>
+ <issueManagementSystem>changes.xml</issueManagementSystem>
+ <issueManagementSystem>JIRA</issueManagementSystem>
+ </issueManagementSystems>
+ <version>${Log4jReleaseVersion}</version>
+ <announceParameters>
<releaseVersion>${Log4jReleaseVersion}</releaseVersion>
- </announcementParameters>
+ </announceParameters>
</configuration>
<executions>
<execution>
Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Wed Jul 11 20:36:25 2012
@@ -158,6 +158,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd.plugin.version}</version>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
Modified: logging/log4j/log4j2/trunk/src/changes/announcement.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/announcement.vm?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/announcement.vm (original)
+++ logging/log4j/log4j2/trunk/src/changes/announcement.vm Wed Jul 11 20:36:25 2012
@@ -16,9 +16,9 @@
## under the License.
#set($relVersion=$announceParameters.releaseVersion)
- Apache Log4j2 ${releaseVersion} RELEASE NOTES
+ Apache Log4j2 ${relVersion} RELEASE NOTES
-The ${developmentTeam} is pleased to announce the Log4j2 ${releaseVersion} release!
+The ${developmentTeam} is pleased to announce the Log4j2 ${relVersion} release!
Apache Log4j2 ${relVersion} requires a minimum of Java 5 to build and run. Basic compatibility with
Log4j 1.x is provided through the log4j12-api component, however it does not implement some of the
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/build.xml?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/build.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/build.xml Wed Jul 11 20:36:25 2012
@@ -23,8 +23,27 @@
</properties>
<body>
- <section name="Releases">
+ <section name="Building and Installing Log4j 2.x">
+ <subsection name="Building">
+ <p>
+ Log4j 2.x is hosted in the Apache Software Foundation's subversion repository. Details on obtaining the
+ most current source code can be found at
+ <a href="http://logging.apache.org/log4j/2.x/source-repository.html">Log4j Source Repository]</a>.
+ The source from the latest release may be obtained by downloading it using the instructions at
+ <a href="http://logging.apache.org/log4j/2.x/download.html">Log4j Downloads</a>.
+ </p>
+ <p>
+ Log4j 2.x uses Maven 2 or 3 as its build tool. To build Log4j simply run "mvn install" from the root
+ directory.
+ </p>
+ </subsection>
+ <p>
+ Applications that use Maven can retrieve the artifacts from the Maven Central repository by using
+ </p>
+ <subsection name="Using In Applications">
+
+ </subsection>
</section>
</body>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/index.xml?rev=1360385&r1=1360384&r2=1360385&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/index.xml Wed Jul 11 20:36:25 2012
@@ -46,7 +46,7 @@
</p>
<h3>Support for multiple APIs</h3>
<p>
- While the Log4j 2 API will provide the best performance, support for the SL4J and Commons Logging
+ While the Log4j 2 API will provide the best performance, support for the SLF4J and Commons Logging
APIs are provided.
</p>
<h3>Automatic Reloading of Configurations</h3>
@@ -80,7 +80,7 @@
<section name="Requirements">
<p>
- Log4j 2 requires Java 5 but has will take advantage of enhancements in Java 6 to improve performance.
+ Log4j 2 requires Java 5 but will take advantage of enhancements in Java 6 to improve performance.
Some features may require optional dependencies. These dependencies are
specified in the documentation for those features.
</p>