Author: dkulp Date: Tue Nov 27 19:25:44 2012 New Revision: 1414329 URL: http://svn.apache.org/viewvc?rev=1414329&view=rev Log: Merged revisions 1414327 via git cherry-pick from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........ r1414327 | dkulp | 2012-11-27 14:24:36 -0500 (Tue, 27 Nov 2012) | 11 lines Merged revisions 1414324 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk ........ r1414324 | dkulp | 2012-11-27 14:18:19 -0500 (Tue, 27 Nov 2012) | 3 lines Late version of Checkstyle no longer supports the DoubleCHeckedLocking test. Since the default version of checkstyle plugin in eclipse now is the latest version, causes issues. ........ ........ Modified: camel/branches/camel-2.9.x/buildingtools/camel-checkstyle.xml camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-checkstyle.xml Modified: camel/branches/camel-2.9.x/buildingtools/camel-checkstyle.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/buildingtools/camel-checkstyle.xml?rev=1414329&r1=1414328&r2=1414329&view=diff ============================================================================== --- camel/branches/camel-2.9.x/buildingtools/camel-checkstyle.xml (original) +++ camel/branches/camel-2.9.x/buildingtools/camel-checkstyle.xml Tue Nov 27 19:25:44 2012 @@ -196,7 +196,6 @@ lengths, if/try depths, etc... <!--<module name="ArrayTrailingComma"/>--> <!--<module name="AvoidInlineConditionals"/>--> <module name="CovariantEquals"/> - <module name="DoubleCheckedLocking"/> <module name="EmptyStatement"/> <module name="EqualsHashCode"/> <!--<module name="FinalLocalVariable"/>--> Modified: camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-checkstyle.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-checkstyle.xml?rev=1414329&r1=1414328&r2=1414329&view=diff ============================================================================== --- camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-checkstyle.xml (original) +++ camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-checkstyle.xml Tue Nov 27 19:25:44 2012 @@ -199,7 +199,6 @@ lengths, if/try depths, etc... <!--<module name="ArrayTrailingComma"/>--> <!--<module name="AvoidInlineConditionals"/>--> <module name="CovariantEquals"/> - <module name="DoubleCheckedLocking"/> <module name="EmptyStatement"/> <module name="EqualsHashCode"/> <!--<module name="FinalLocalVariable"/>--> @@ -343,4 +342,4 @@ lengths, if/try depths, etc... <!--<module name="RequiredRegexp">--> </module> <module name="SuppressionCommentFilter"/> -</module> \ No newline at end of file +</module>
