APEXMALHAR-2043 removed local copies of checkstyle config in Malhar and updated checkstyle plugin dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/723189b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/723189b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/723189b4 Branch: refs/heads/devel-3 Commit: 723189b4fbe78083424010f031a6b4041d821132 Parents: 9594f37 Author: Chandni Singh <[email protected]> Authored: Sat Apr 2 00:26:41 2016 -0700 Committer: Chandni Singh <[email protected]> Committed: Sat Apr 2 00:26:41 2016 -0700 ---------------------------------------------------------------------- apex_checks.xml | 173 --------------------------------------- checkstyle-suppressions.xml | 27 ------ contrib/pom.xml | 2 +- library/pom.xml | 2 +- pom.xml | 7 ++ 5 files changed, 9 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/723189b4/apex_checks.xml ---------------------------------------------------------------------- diff --git a/apex_checks.xml b/apex_checks.xml deleted file mode 100644 index 78e89af..0000000 --- a/apex_checks.xml +++ /dev/null @@ -1,173 +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";> - -<module name="Checker"> - <property name="charset" value="UTF-8"/> - - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - - <module name="NewlineAtEndOfFile"> - <property name="lineSeparator" value="lf"/> - </module> - - <module name="RegexpMultiline"> - <property name="format" value="System\.(out)|(err)\.print(ln)?\("/> - </module> - - <module name="TreeWalker"> - <module name="OneTopLevelClass"/> - <!-- checks package and import stmts are not line wrapped --> - <module name="NoLineWrap"/> - - <module name="EmptyBlock"> - <property name="option" value="TEXT"/> - <property name="tokens" - value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> - </module> - <!-- checks for braces around code blocks --> - <module name="NeedBraces"/> - - <module name="LeftCurly"> - <property name="option" value="eol"/> - <property name="tokens" - value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, - LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/> - </module> - - <module name="LeftCurly"> - <property name="option" value="nl"/> - <!-- Add OBJBLOCK once it moves to apache apex 3.3. version--> - <property name="tokens" - value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, INTERFACE_DEF, METHOD_DEF"/> - </module> - - <module name="RightCurly"> - <property name="option" value="same"/> - <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE"/> - </module> - - <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="NoWhitespaceAfter"> - <property name="tokens" - value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, TYPECAST, ARRAY_DECLARATOR"/> - </module> - - <module name="NoWhitespaceBefore"> - <!-- ADD COMMA once it moves to apache apex 3.3.0 version --> - <property name="tokens" value="SEMI, POST_DEC, POST_INC"/> - </module> - - <module name="NoWhitespaceBefore"> - <property name="tokens" value="DOT"/> - <property name="allowLineBreaks" value="true"/> - </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."/> - <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> - </module> - - <module name="LineLength"> - <property name="max" value="120"/> - <property name="severity" value="warning"/> - </module> - - <module name="OneStatementPerLine"/> - <module name="MultipleVariableDeclarations"/> - <module name="ArrayTypeStyle"/> - <module name="MissingSwitchDefault"/> - - <!-- If the logic requires fallthrough then the text "fallthru", "fall through", "fallthrough", - "falls through" and "fallsthrough" can be placed as a comment after the last line of the case --> - <module name="FallThrough"/> - - <module name="UpperEll"/> - <module name="ModifierOrder"/> - <module name="EmptyLineSeparator"> - <property name="tokens" - value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, METHOD_DEF, STATIC_INIT, INSTANCE_INIT"/> - </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="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 be 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="2"/> - <property name="arrayInitIndent" value="2"/> - <property name="lineWrappingIndentation" value="4"/> - <property name="forceStrictCondition" value="true"/> - </module> - - <module name="AnnotationLocation"> - <property name="allowSamelineMultipleAnnotations" value="false"/> - <property name="allowSamelineSingleParameterlessAnnotation" value="true"/> - <property name="allowSamelineParameterizedAnnotation" value="false"/> - </module> - - <module name="ImportOrder"> - <property name="groups" value="/^javax?\./,org,/org\.apache/,com,/com\.datatorrent/,*"/> - <property name="ordered" value="true"/> - <property name="option" value="bottom"/> - <property name="sortStaticImportsAlphabetically" value="true"/> - </module> - <module name="AvoidStarImport"/> - <module name="RedundantImport"/> - <module name="UnusedImports"/> - <module name="MethodParamPad"/> - </module> - -</module> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/723189b4/checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml deleted file mode 100644 index 08763a3..0000000 --- a/checkstyle-suppressions.xml +++ /dev/null @@ -1,27 +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 suppressions PUBLIC - "-//Puppy Crawl//DTD Suppressions 1.0//EN" - "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd";> - -<suppressions> -</suppressions> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/723189b4/contrib/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/pom.xml b/contrib/pom.xml index 4bbd8f5..92dbd3b 100755 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -220,7 +220,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> - <maxAllowedViolations>2754</maxAllowedViolations> + <maxAllowedViolations>2791</maxAllowedViolations> <consoleOutput>false</consoleOutput> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/723189b4/library/pom.xml ---------------------------------------------------------------------- diff --git a/library/pom.xml b/library/pom.xml index 5ff8842..0fcc3cb 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -186,7 +186,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> - <maxAllowedViolations>15966</maxAllowedViolations> + <maxAllowedViolations>16002</maxAllowedViolations> <consoleOutput>false</consoleOutput> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/723189b4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 249a8da..360ddc9 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apex</groupId> + <artifactId>apex-codestyle-config</artifactId> + <version>1.0.0-incubating</version> + </dependency> + </dependencies> <configuration> <consoleOutput>true</consoleOutput> </configuration>
