Author: rpopma
Date: Mon Apr 29 03:13:42 2013
New Revision: 1476883
URL: http://svn.apache.org/r1476883
Log:
Removed CheckStyle false positives for NewlineAtEndOfFile and whitespace
following '*' at end of line in javadoc
Modified:
logging/log4j/log4j2/trunk/checkstyle.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified: logging/log4j/log4j2/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/checkstyle.xml?rev=1476883&r1=1476882&r2=1476883&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/checkstyle.xml (original)
+++ logging/log4j/log4j2/trunk/checkstyle.xml Mon Apr 29 03:13:42 2013
@@ -31,8 +31,10 @@
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile"/>
-
+ <module name="NewlineAtEndOfFile">
+ <property name="lineSeparator" value="lf"/>
+ </module>
+
<!-- Checks that property files contain the same keys. -->
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
<module name="Translation"/>
@@ -53,8 +55,10 @@
<!-- Checks for white space at the end of the line -->
<!-- See http://checkstyle.sourceforge.net/config_regexp.html -->
+ <!-- Updated to ignore whitespace following '*' in javadoc comments -->
+ <!--
http://stackoverflow.com/questions/9100059/checkstyle-trailing-spaces-regexp-issue
-->
<module name="RegexpSingleline">
- <property name="format" value="\s+$"/>
+ <property name="format" value="(?<!\A[ \t]*\*?)[ \t]$"/>
<property name="message" value="Line has trailing spaces."/>
<property name="fileExtensions" value="java"/>
</module>
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1476883&r1=1476882&r2=1476883&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Apr 29 03:13:42 2013
@@ -24,6 +24,9 @@
<body>
<release version="2.0-beta6" date="@TBD@" description="Bug fixes and
enhancements">
<action dev="rpopma" type="update">
+ Removed CheckStyle false positives for NewlineAtEndOfFile and
whitespace following '*' at end of line in javadoc.
+ </action>
+ <action dev="rpopma" type="update">
Moved Clock interface to package org.apache.logging.log4j.core.helpers.
</action>
<action issue="LOG4J2-225" dev="rpopma" type="update">
