You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by mp...@apache.org on 2016/07/09 21:56:10 UTC
flume git commit: FLUME-2949. checkstyle: Make suppressions
compatible with Windows
Repository: flume
Updated Branches:
refs/heads/trunk 19664c3c5 -> 188c3104a
FLUME-2949. checkstyle: Make suppressions compatible with Windows
File paths in checkstyle-suppressions.xml are written with non-portable
separators. Switching to "[/\\]" as a path separator should fix this
issue.
(Lior Zeno via Mike Percy)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/188c3104
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/188c3104
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/188c3104
Branch: refs/heads/trunk
Commit: 188c3104ab6030c40d652595a2274527a4ad4105
Parents: 19664c3
Author: Mike Percy <mp...@apache.org>
Authored: Sat Jul 9 14:54:07 2016 -0700
Committer: Mike Percy <mp...@apache.org>
Committed: Sat Jul 9 14:54:07 2016 -0700
----------------------------------------------------------------------
.../main/resources/flume/checkstyle-suppressions.xml | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/188c3104/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml b/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml
index 2642baa..78b9ee7 100644
--- a/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml
+++ b/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml
@@ -2,15 +2,19 @@
<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.0//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<!-- NOTE: All path separators must be specified as [/\\] in order to maintain
+ build compatibility with both UNIX and Windows. -->
+
<suppressions>
<!-- Suppress all style checks for generated code -->
<suppress checks=".*"
- files="generated-sources|com/cloudera/flume/handlers/thrift|org/apache/flume/thrift/|org/apache/flume/source/scribe|ProtosFactory.java"/>
+ files="generated-sources|com[/\\]cloudera[/\\]flume[/\\]handlers[/\\]thrift|org[/\\]apache[/\\]flume[/\\]thrift[/\\]|org[/\\]apache[/\\]flume[/\\]source[/\\]scribe|ProtosFactory.java"/>
<!-- The "legacy" sources have a weird camelCaps package name -->
<suppress checks="PackageName"
- files="org/apache/flume/source/avroLegacy|org/apache/flume/source/thriftLegacy"/>
+ files="org[/\\]apache[/\\]flume[/\\]source[/\\]avroLegacy|org[/\\]apache[/\\]flume[/\\]source[/\\]thriftLegacy"/>
<!-- Allow unicode escapes in tests -->
<suppress checks="AvoidEscapedUnicodeCharacters"
@@ -18,7 +22,7 @@
<!-- TODO: Rearrange methods in below classes to keep overloaded methods adjacent -->
<suppress checks="OverloadMethodsDeclarationOrder"
- files="channel/file|RpcClientFactory\.java|BucketPath\.java|SinkGroup\.java|DefaultSinkProcessor\.java|RegexExtractorInterceptorMillisSerializer\.java|SimpleAsyncHbaseEventSerializer\.java|hdfs/BucketWriter\.java|AbstractBasicChannelSemanticsTest\.java"/>
+ files="channel[/\\]file|RpcClientFactory\.java|BucketPath\.java|SinkGroup\.java|DefaultSinkProcessor\.java|RegexExtractorInterceptorMillisSerializer\.java|SimpleAsyncHbaseEventSerializer\.java|hdfs[/\\]BucketWriter\.java|AbstractBasicChannelSemanticsTest\.java"/>
<!-- TODO: Fix inner class names to follow standard convention -->
<suppress checks="TypeName"
@@ -34,7 +38,7 @@
<!-- TODO: Avoid empty catch blocks -->
<suppress checks="EmptyCatchBlock"
- files="channel/file/LogFile\.java|TestDatasetSink\.java|CountingSourceRunner\.java|CountingSinkRunner\.java|TestKafkaChannel\.java|TestTaildirSource\.java|TestChannelProcessor\.java|TestHiveSink\.java|AbstractBasicChannelSemanticsTest\.java|TestJMSSource\.java|TestEmbeddedAgent\.java|TestAsyncHBaseSink\.java"/>
+ files="channel[/\\]file[/\\]LogFile\.java|TestDatasetSink\.java|CountingSourceRunner\.java|CountingSinkRunner\.java|TestKafkaChannel\.java|TestTaildirSource\.java|TestChannelProcessor\.java|TestHiveSink\.java|AbstractBasicChannelSemanticsTest\.java|TestJMSSource\.java|TestEmbeddedAgent\.java|TestAsyncHBaseSink\.java"/>
<!-- TODO: Avoid empty if blocks -->
<suppress checks="EmptyBlockCheck"
@@ -42,7 +46,7 @@
<!-- TODO: Fix line length issues -->
<suppress checks="LineLengthCheck"
- files="channel/MemoryChannel\.java|ReliableSpoolingFileEventReader\.java|TestAvroSink\.java"/>
+ files="channel[/\\]MemoryChannel\.java|ReliableSpoolingFileEventReader\.java|TestAvroSink\.java"/>
<!-- TODO: Move helper classes to their own files -->
<suppress checks="OneTopLevelClass"