You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/10/31 03:51:14 UTC

[1/2] incubator-beam git commit: Remove unnecessary configuration properties from checkstyle.xml

Repository: incubator-beam
Updated Branches:
  refs/heads/master 7160ee9e4 -> 594892d11


Remove unnecessary configuration properties from checkstyle.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7a0a8207
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7a0a8207
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7a0a8207

Branch: refs/heads/master
Commit: 7a0a8207878e8316f416ab1a1429c051d2ac7470
Parents: 9c3e3e7
Author: Scott Wegner <sw...@google.com>
Authored: Fri Oct 28 09:17:46 2016 -0700
Committer: Scott Wegner <sw...@google.com>
Committed: Fri Oct 28 09:17:46 2016 -0700

----------------------------------------------------------------------
 sdks/java/build-tools/src/main/resources/beam/checkstyle.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7a0a8207/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
----------------------------------------------------------------------
diff --git a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
index eb414bf..e57cfec 100644
--- a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
@@ -65,7 +65,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <property name="checkFormat" value="$1"/>
   </module>
   <module name="SuppressionFilter">
-    <property name="file" value="${checkstyle.suppressions.file}" />
+    <property name="file" value="${checkstyle.suppressions.file}" default="suppressions.xml" />
   </module>
 
   <!-- Check that every module has a package-info.java -->
@@ -287,7 +287,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
 
     <module name="LineLength">
       <!-- Checks if a line is too long. -->
-      <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
+      <property name="max" value="100"/>
       <property name="severity" value="error"/>
 
       <!--
@@ -297,8 +297,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
       -->
 
       <property name="ignorePattern"
-          value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
-          default="^(package .*;\s*)|(import .*;\s*)|( *\* .*https?://.*)$"/>
+          value="^(package .*;\s*)|(import .*;\s*)|( *\* .*https?://.*)$"/>
     </module>
 
     <module name="LeftCurly">


[2/2] incubator-beam git commit: This closes #1218

Posted by ke...@apache.org.
This closes #1218


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/594892d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/594892d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/594892d1

Branch: refs/heads/master
Commit: 594892d11a398411051cd992f11ef3bc7605627a
Parents: 7160ee9 7a0a820
Author: Kenneth Knowles <kl...@google.com>
Authored: Sun Oct 30 20:51:03 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Sun Oct 30 20:51:03 2016 -0700

----------------------------------------------------------------------
 sdks/java/build-tools/src/main/resources/beam/checkstyle.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------