You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2015/10/25 20:38:10 UTC

[27/36] incubator-apex-core git commit: APEX-204 #resolve #comment setting linebreaks to true for NoWhitespaceBefore->dot and continuation indentation to be 2

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/feature-module
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>