You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/12/09 16:37:32 UTC
svn commit: r1718887 -
/commons/proper/jexl/branches/2.0/src/main/config/checkstyle.xml
Author: sebb
Date: Wed Dec 9 15:37:32 2015
New Revision: 1718887
URL: http://svn.apache.org/viewvc?rev=1718887&view=rev
Log:
Fix up checkstyle rules
Modified:
commons/proper/jexl/branches/2.0/src/main/config/checkstyle.xml
Modified: commons/proper/jexl/branches/2.0/src/main/config/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/config/checkstyle.xml?rev=1718887&r1=1718886&r2=1718887&view=diff
==============================================================================
--- commons/proper/jexl/branches/2.0/src/main/config/checkstyle.xml (original)
+++ commons/proper/jexl/branches/2.0/src/main/config/checkstyle.xml Wed Dec 9 15:37:32 2015
@@ -83,6 +83,7 @@
<!-- value="${basedir}/java.header"/> -->
<property name="headerFile" value="${checkstyle.header.file}"/>
<property name="ignoreLines" value="2"/>
+ <property name="fileExtensions" value="java,xml"/>
</module>
<!-- See http://checkstyle.sf.net/config_sizes.html -->
@@ -157,7 +158,9 @@
<!-- Checks for blocks. You know, those {}'s -->
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ </module>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
@@ -166,7 +169,6 @@
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
<!-- JEXL: module name="AvoidInlineConditionals"/-->
- <module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="HiddenField"/>
@@ -188,6 +190,8 @@
<!-- JEXL: module name="HideUtilityClassConstructor"/-->
<module name="InterfaceIsType"/>
<module name="VisibilityModifier">
+ <property name="packageAllowed" value="true"/>
+ <!-- Fixing protected vars would break compatibilty -->
<property name="protectedAllowed" value="true"/>
</module>