Repository: flume Updated Branches: refs/heads/flume-1.7 2526ea06c -> 38b5b3a7e
Remove checkstyle from flume-1.7 branch Something about the checkstyle Maven config is causing the source artifact build to fail. Let's just remove checkstyle from the 1.7 branch for the moment until we figure out how to solve this problem. This should unblock the release. The source artifact appears to be being generated after applying this patch. This closes #66 Reviewers: Denes Arvay, Bessenyei Balázs Donát (Mike Percy via Bessenyei Balázs Donát) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/38b5b3a7 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/38b5b3a7 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/38b5b3a7 Branch: refs/heads/flume-1.7 Commit: 38b5b3a7ed98cedaaef2b9351518a9fe09703a05 Parents: 2526ea0 Author: Mike Percy <[email protected]> Authored: Tue Oct 11 15:48:33 2016 +0200 Committer: Bessenyei Balázs Donát <[email protected]> Committed: Tue Oct 11 16:16:48 2016 +0200 ---------------------------------------------------------------------- flume-checkstyle/pom.xml | 34 ---- .../resources/flume/checkstyle-suppressions.xml | 74 ------- .../src/main/resources/flume/checkstyle.xml | 196 ------------------- pom.xml | 64 ------ 4 files changed, 368 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/38b5b3a7/flume-checkstyle/pom.xml ---------------------------------------------------------------------- diff --git a/flume-checkstyle/pom.xml b/flume-checkstyle/pom.xml deleted file mode 100644 index a5e3b37..0000000 --- a/flume-checkstyle/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.flume</groupId> - <artifactId>flume-checkstyle</artifactId> - <name>Flume checkstyle project</name> - <version>1.7.0</version> - - <properties> - <!-- Set default encoding to UTF-8 to remove maven complaints --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - -</project> http://git-wip-us.apache.org/repos/asf/flume/blob/38b5b3a7/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 deleted file mode 100644 index 5981468..0000000 --- a/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<!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"/> - - <!-- The "legacy" sources have a weird camelCaps package name --> - <suppress checks="PackageName" - files="org[/\\]apache[/\\]flume[/\\]source[/\\]avroLegacy|org[/\\]apache[/\\]flume[/\\]source[/\\]thriftLegacy"/> - - <!-- Allow unicode escapes in tests --> - <suppress checks="AvoidEscapedUnicodeCharacters" - files="Test.*\.java"/> - - <!-- 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"/> - - <!-- TODO: Fix inner class names to follow standard convention --> - <suppress checks="TypeName" - files="SyslogUDPSource\.java|SyslogTcpSource\.java|TaildirSource\.java"/> - - <!-- TODO: Method names must follow standard Java naming conventions --> - <suppress checks="MethodNameCheck" - files="TestBucketWriter\.java|TestSyslogUtils\.java"/> - - <!-- TODO: Add default cases to switch statements --> - <suppress checks="MissingSwitchDefault" - files="SyslogUtils\.java|ReliableTaildirEventReader\.java|AbstractBasicChannelSemanticsTest\.java"/> - - <!-- 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"/> - - <!-- TODO: Avoid empty if blocks --> - <suppress checks="EmptyBlockCheck" - files="ElasticSearchClientFactory\.java"/> - - <!-- TODO: Fix line length issues --> - <suppress checks="LineLengthCheck" - files="channel[/\\]MemoryChannel\.java|ReliableSpoolingFileEventReader\.java|TestAvroSink\.java"/> - - <!-- TODO: Move helper classes to their own files --> - <suppress checks="OneTopLevelClass" - files="KafkaSource\.java|KafkaChannel\.java|KafkaSink\.java|TestElasticSearchSink\.java"/> - -</suppressions> http://git-wip-us.apache.org/repos/asf/flume/blob/38b5b3a7/flume-checkstyle/src/main/resources/flume/checkstyle.xml ---------------------------------------------------------------------- diff --git a/flume-checkstyle/src/main/resources/flume/checkstyle.xml b/flume-checkstyle/src/main/resources/flume/checkstyle.xml deleted file mode 100644 index 7035e09..0000000 --- a/flume-checkstyle/src/main/resources/flume/checkstyle.xml +++ /dev/null @@ -1,196 +0,0 @@ -<?xml version="1.0"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> - -<!-- - Checkstyle configuration that checks the Google coding conventions from Google Java Style - that can be found at https://google.github.io/styleguide/javaguide.html. - - Checkstyle is very configurable. Be sure to read the documentation at - http://checkstyle.sf.net (or in your downloaded distribution). - - To completely disable a check, just comment it out or delete it from the file. - - Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov. - --> - -<module name = "Checker"> - <property name="charset" value="UTF-8"/> - - <property name="severity" value="error"/> - - <property name="fileExtensions" value="java, properties, xml"/> - <!-- Checks for whitespace --> - <!-- See http://checkstyle.sf.net/config_whitespace.html --> - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - - <module name="TreeWalker"> - <module name="OuterTypeFilename"/> - <module name="IllegalTokenText"> - <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> - <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> - <property name="message" value="Avoid using corresponding octal or Unicode escape."/> - </module> - <module name="AvoidEscapedUnicodeCharacters"> - <property name="allowEscapesForControlCharacters" value="true"/> - <property name="allowByTailComment" value="true"/> - <property name="allowNonPrintableEscapes" value="true"/> - </module> - <module name="LineLength"> - <property name="max" value="100"/> - <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> - </module> - <module name="AvoidStarImport"> - <property name="allowStaticMemberImports" value="true"/> - </module> - <module name="OneTopLevelClass"/> - <module name="NoLineWrap"/> - <module name="EmptyBlock"> - <property name="option" value="TEXT"/> - <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> - </module> - <module name="NeedBraces"> - <property name="allowSingleLineStatement" value="true"/> - </module> - <module name="LeftCurly"> - <property name="maxLineLength" value="100"/> - </module> - <module name="RightCurly"/> - <module name="RightCurly"> - <property name="option" value="alone"/> - <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> - </module> - <module name="WhitespaceAround"> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - <property name="allowEmptyTypes" value="true"/> - <property name="allowEmptyLoops" value="true"/> - <message key="ws.notFollowed" - value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> - <message key="ws.notPreceded" - value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> - </module> - <module name="OneStatementPerLine"/> - <module name="ArrayTypeStyle"/> - <module name="MissingSwitchDefault"/> - <module name="FallThrough"/> - <module name="UpperEll"/> - <module name="ModifierOrder"/> - <module name="EmptyLineSeparator"> - <property name="allowNoEmptyLineBetweenFields" value="true"/> - <property name="allowMultipleEmptyLines" value="false"/> - <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/> - <property name="tokens" value="IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, CTOR_DEF, VARIABLE_DEF"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="DOT"/> - <property name="option" value="nl"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="COMMA"/> - <property name="option" value="EOL"/> - </module> - <module name="PackageName"> - <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/> - <message key="name.invalidPattern" - value="Package name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="TypeName"> - <message key="name.invalidPattern" - value="Type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="ClassTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Class type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="MethodTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Method type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="InterfaceTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Interface type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="NoFinalizer"/> - <module name="GenericWhitespace"> - <message key="ws.followed" - value="GenericWhitespace ''{0}'' is followed by whitespace."/> - <message key="ws.preceded" - value="GenericWhitespace ''{0}'' is preceded with whitespace."/> - <message key="ws.illegalFollow" - value="GenericWhitespace ''{0}'' should followed by whitespace."/> - <message key="ws.notPreceded" - value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> - </module> - <module name="Indentation"> - <property name="basicOffset" value="2"/> - <property name="braceAdjustment" value="0"/> - <property name="caseIndent" value="2"/> - <property name="throwsIndent" value="4"/> - <property name="lineWrappingIndentation" value="4"/> - <property name="arrayInitIndent" value="2"/> - </module> - <module name="OverloadMethodsDeclarationOrder"/> - <module name="MethodParamPad"/> - <module name="AnnotationLocation"> - <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="allowSamelineMultipleAnnotations" value="true"/> - </module> - <module name="AtclauseOrder"> - <property name="tagOrder" value="@param, @return, @throws, @deprecated"/> - <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> - </module> - <module name="JavadocMethod"> - <property name="scope" value="public"/> - <property name="allowMissingJavadoc" value="true"/> - <property name="allowMissingParamTags" value="true"/> - <property name="allowMissingThrowsTags" value="true"/> - <property name="allowMissingReturnTag" value="true"/> - <property name="minLineCount" value="0"/> - <property name="allowedAnnotations" value="Override, Test"/> - <property name="allowThrowsTagsForSubclasses" value="true"/> - </module> - <module name="MethodName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/> - <message key="name.invalidPattern" - value="Method name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="SingleLineJavadoc"> - <property name="ignoreInlineTags" value="false"/> - </module> - <module name="EmptyCatchBlock"> - <property name="exceptionVariableName" value="expected"/> - </module> - <module name="CommentsIndentation"> - <property name="tokens" value="BLOCK_COMMENT_BEGIN"/> - </module> - </module> -</module> http://git-wip-us.apache.org/repos/asf/flume/blob/38b5b3a7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 021ed71..d33be99 100644 --- a/pom.xml +++ b/pom.xml @@ -47,8 +47,6 @@ limitations under the License. <stagingDirectory>${project.basedir}/target/docs</stagingDirectory> <avro.version>1.7.4</avro.version> - <checkstyle.plugin.version>2.17</checkstyle.plugin.version> - <checkstyle.tool.version>6.19</checkstyle.tool.version> <elasticsearch.version>0.90.1</elasticsearch.version> <hadoop2.version>2.4.0</hadoop2.version> <thrift.version>0.7.0</thrift.version> @@ -60,7 +58,6 @@ limitations under the License. </properties> <modules> - <module>flume-checkstyle</module> <module>flume-ng-core</module> <module>flume-ng-configuration</module> <module>flume-ng-embedded-agent</module> @@ -642,47 +639,6 @@ limitations under the License. <artifactId>apache-rat-plugin</artifactId> </plugin> - <!-- Run checkstyle as part of the "verify" phase. See - https://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html - for how to configure plugin for a multi-module project. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <!-- The flume-checkstyle module adds the checkstyle config files to the classpath. --> - <dependency> - <groupId>org.apache.flume</groupId> - <artifactId>flume-checkstyle</artifactId> - <version>${project.version}</version> - </dependency> - <!-- Newer versions of puppycrawl checkstyle have more features. Pull in a more recent - version than is specified in the maven-checkstyle-plugin pom file. --> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>${checkstyle.tool.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>verify</id> - <phase>verify</phase> - <configuration> - <configLocation>flume/checkstyle.xml</configLocation> - <suppressionsLocation>flume/checkstyle-suppressions.xml</suppressionsLocation> - <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> - <encoding>UTF-8</encoding> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <linkXRef>false</linkXRef> - </configuration> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> <pluginManagement> @@ -821,7 +777,6 @@ limitations under the License. <dependencyManagement> <dependencies> - <!-- Dependencies: build --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -1098,11 +1053,6 @@ limitations under the License. <dependency> <groupId>org.apache.flume</groupId> - <artifactId>flume-checkstyle</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>org.apache.flume</groupId> <artifactId>flume-tools</artifactId> <version>1.7.0</version> </dependency> @@ -1470,20 +1420,6 @@ limitations under the License. </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <configuration> - <configLocation>flume/checkstyle.xml</configLocation> - <suppressionsLocation>flume/checkstyle-suppressions.xml</suppressionsLocation> - <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> - <encoding>UTF-8</encoding> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <linkXRef>false</linkXRef> - </configuration> - </plugin> - </plugins> </reporting>
