You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ti...@apache.org on 2015/11/19 20:08:24 UTC
[1/2] incubator-apex-malhar git commit: MLHR-1859 #comment checkstyle
execution phase is inherited from parent with an older version
Repository: incubator-apex-malhar
Updated Branches:
refs/heads/devel-3 640dca0b2 -> 5b9eff836
MLHR-1859 #comment checkstyle execution phase is inherited from parent with an older version
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/33be7946
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/33be7946
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/33be7946
Branch: refs/heads/devel-3
Commit: 33be7946379b8e073601977b41e5e08ecf225624
Parents: 640dca0
Author: Chandni Singh <cs...@apache.org>
Authored: Thu Nov 19 01:14:23 2015 -0800
Committer: Chandni Singh <cs...@apache.org>
Committed: Thu Nov 19 07:55:08 2015 -0800
----------------------------------------------------------------------
apex_checks.xml | 7 ++++---
checkstyle-suppressions.xml | 28 ----------------------------
pom.xml | 9 +--------
3 files changed, 5 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/33be7946/apex_checks.xml
----------------------------------------------------------------------
diff --git a/apex_checks.xml b/apex_checks.xml
index 7474e67..dc334f5 100644
--- a/apex_checks.xml
+++ b/apex_checks.xml
@@ -60,9 +60,9 @@
<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,
- OBJBLOCK"/>
+ value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, INTERFACE_DEF, METHOD_DEF"/>
</module>
<module name="RightCurly">
@@ -82,7 +82,8 @@
</module>
<module name="NoWhitespaceBefore">
- <property name="tokens" value="COMMA, SEMI, POST_DEC, POST_INC"/>
+ <!-- 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">
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/33be7946/checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
deleted file mode 100644
index 7496011..0000000
--- a/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,28 +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>
- <suppress checks="RegexpMultiline" files="DTCli.java"/>
-</suppressions>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/33be7946/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 388c4ed..e3a22fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,15 +144,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>9071</maxAllowedViolations>
+ <maxAllowedViolations>8938</maxAllowedViolations>
</configuration>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.12.1</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
[2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1859' into
devel-3
Posted by ti...@apache.org.
Merge branch 'MLHR-1859' into devel-3
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/5b9eff83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/5b9eff83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/5b9eff83
Branch: refs/heads/devel-3
Commit: 5b9eff83606f0eb1474ba458ed147c42267ba021
Parents: 640dca0 33be794
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Thu Nov 19 11:08:13 2015 -0800
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Thu Nov 19 11:08:13 2015 -0800
----------------------------------------------------------------------
apex_checks.xml | 7 ++++---
checkstyle-suppressions.xml | 28 ----------------------------
pom.xml | 9 +--------
3 files changed, 5 insertions(+), 39 deletions(-)
----------------------------------------------------------------------