You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by il...@apache.org on 2015/10/22 07:07:29 UTC
[1/3] incubator-apex-core git commit: APEX-211 #resolve #comment
placement of left brace in static block
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 83f95d82d -> 2e8ffc6be
APEX-211 #resolve #comment placement of left brace in static block
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/eb0a95fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/eb0a95fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/eb0a95fe
Branch: refs/heads/devel-3
Commit: eb0a95fed5243495bdbecf6ea159467d92d698aa
Parents: 496161a
Author: Chandni Singh <cs...@apache.org>
Authored: Wed Oct 21 17:15:39 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Wed Oct 21 17:17:04 2015 -0700
----------------------------------------------------------------------
apex_checks.xml | 4 ++--
api/pom.xml | 2 +-
common/pom.xml | 2 +-
engine/pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/eb0a95fe/apex_checks.xml
----------------------------------------------------------------------
diff --git a/apex_checks.xml b/apex_checks.xml
index 0cba087..bc17e64 100644
--- a/apex_checks.xml
+++ b/apex_checks.xml
@@ -54,13 +54,13 @@
<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"/>
+ 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"/>
<property name="tokens"
- value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, INTERFACE_DEF, METHOD_DEF, STATIC_INIT "/>
+ value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, INTERFACE_DEF, METHOD_DEF"/>
</module>
<module name="RightCurly">
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/eb0a95fe/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index bb851bd..9224e63 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -89,7 +89,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>50</maxAllowedViolations>
+ <maxAllowedViolations>49</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/eb0a95fe/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index b6929ab..1f7080d 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -74,7 +74,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>87</maxAllowedViolations>
+ <maxAllowedViolations>80</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/eb0a95fe/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index f5d8275..8e75151 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -145,7 +145,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>2076</maxAllowedViolations>
+ <maxAllowedViolations>2063</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
[3/3] incubator-apex-core git commit: Merge branch 'devel-3' of
https://git-wip-us.apache.org/repos/asf/incubator-apex-core into devel-3
Posted by il...@apache.org.
Merge branch 'devel-3' of https://git-wip-us.apache.org/repos/asf/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/2e8ffc6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/2e8ffc6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/2e8ffc6b
Branch: refs/heads/devel-3
Commit: 2e8ffc6be9905dc2165965445a2122caa9b49776
Parents: eb0a95f 83f95d8
Author: Ilya Ganelin <il...@capitalone.com>
Authored: Wed Oct 21 22:07:47 2015 -0700
Committer: Ilya Ganelin <il...@capitalone.com>
Committed: Wed Oct 21 22:07:47 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/stram/StreamingContainerManager.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-apex-core git commit: APEX-204 #resolve #comment
setting linebreaks to true for NoWhitespaceBefore->dot and continuation
indentation to be 2
Posted by il...@apache.org.
APEX-204 #resolve #comment setting linebreaks to true for NoWhitespaceBefore->dot and continuation indentation to be 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/496161ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/496161ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/496161ac
Branch: refs/heads/devel-3
Commit: 496161ac2d936e2c67f1ec6317cc440bebaf9148
Parents: e3cecc2
Author: Chandni Singh <cs...@apache.org>
Authored: Tue Oct 20 15:25:51 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Wed Oct 21 17:17:04 2015 -0700
----------------------------------------------------------------------
apex_checks.xml | 10 +++++++++-
engine/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/496161ac/apex_checks.xml
----------------------------------------------------------------------
diff --git a/apex_checks.xml b/apex_checks.xml
index 3bdc27e..0cba087 100644
--- a/apex_checks.xml
+++ b/apex_checks.xml
@@ -80,7 +80,12 @@
</module>
<module name="NoWhitespaceBefore">
- <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+ <property name="tokens" value="COMMA, SEMI, POST_DEC, POST_INC"/>
+ </module>
+
+ <module name="NoWhitespaceBefore">
+ <property name="tokens" value="DOT"/>
+ <property name="allowLineBreaks" value="true"/>
</module>
<module name="WhitespaceAround">
@@ -133,6 +138,9 @@
<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="2"/>
</module>
<module name="ImportOrder">
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/496161ac/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index 0c99ce0..f5d8275 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -145,7 +145,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>2320</maxAllowedViolations>
+ <maxAllowedViolations>2076</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/496161ac/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 13d5f52..807bf7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -310,7 +310,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>6.9</version>
+ <version>6.11</version>
</dependency>
</dependencies>
<executions>