Repository: incubator-beam Updated Branches: refs/heads/master c6aac3b26 -> ffb7002b8
Update checkstyle.xml to require Apache copyright header in each file Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/43f25f1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/43f25f1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/43f25f1c Branch: refs/heads/master Commit: 43f25f1cd4fbbd17bc72162457351df0d8c5097d Parents: d59c801 Author: Davor Bonaci <[email protected]> Authored: Wed Mar 30 15:16:39 2016 -0700 Committer: Dan Halperin <[email protected]> Committed: Wed Mar 30 16:34:14 2016 -0700 ---------------------------------------------------------------------- sdks/java/checkstyle.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/43f25f1c/sdks/java/checkstyle.xml ---------------------------------------------------------------------- diff --git a/sdks/java/checkstyle.xml b/sdks/java/checkstyle.xml index 6852e6c..504bdc1 100644 --- a/sdks/java/checkstyle.xml +++ b/sdks/java/checkstyle.xml @@ -26,21 +26,20 @@ page at http://checkstyle.sourceforge.net/config.html --> <module name="Checker"> <module name="RegexpSingleline"> - <!-- Requires a Google copyright notice in each file. + <!-- Requires the Apache copyright header in each file. Code intended to be open-sourced may have a multi-line copyright notice, so that this required text appears on the second line: <pre> /* - * Copyright 2015 Google Inc. - * - * (details of open-source license...) + * Licensed to the Apache Software Foundation (ASF) under one + * ... </pre> --> <property name="format" - value="^(//| \*) Copyright (\([cC]\) )?[\d]{4}(\-[\d]{4})? (Google Inc\.|The Google Cloud Dataflow.*Authors).*$" /> + value="^ \* Licensed to the Apache Software Foundation \(ASF\) under one$" /> <property name="minimum" value="1" /> <property name="maximum" value="10" /> - <property name="message" value="Google copyright is missing or malformed." /> + <property name="message" value="Apache copyright is missing or malformed." /> <property name="severity" value="error" /> </module>
