Repository: flume Updated Branches: refs/heads/trunk 5a083a30b -> 988ede948
FLUME-2959. Fix issues with flume-checkstyle module * The lack of a parent POM caused warnings related to UTF-8 encoding * The XML files should have an ASL 2.0 license header (Lior Zeno via Mike Percy) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/988ede94 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/988ede94 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/988ede94 Branch: refs/heads/trunk Commit: 988ede948ffaf6526c226323a6808922f38b625c Parents: 5a083a3 Author: Lior Zeno <[email protected]> Authored: Wed Jul 27 11:49:43 2016 -0700 Committer: Mike Percy <[email protected]> Committed: Wed Jul 27 11:50:56 2016 -0700 ---------------------------------------------------------------------- flume-checkstyle/pom.xml | 6 ++++++ .../resources/flume/checkstyle-suppressions.xml | 19 +++++++++++++++++++ .../src/main/resources/flume/checkstyle.xml | 19 +++++++++++++++++++ 3 files changed, 44 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/988ede94/flume-checkstyle/pom.xml ---------------------------------------------------------------------- diff --git a/flume-checkstyle/pom.xml b/flume-checkstyle/pom.xml index 74ebf6b..10d74f3 100644 --- a/flume-checkstyle/pom.xml +++ b/flume-checkstyle/pom.xml @@ -25,4 +25,10 @@ <artifactId>flume-checkstyle</artifactId> <name>Flume checkstyle project</name> <version>1.7.0-SNAPSHOT</version> + + <properties> + <!-- Set default encoding to UTF-8 to remove maven complaints --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + </project> http://git-wip-us.apache.org/repos/asf/flume/blob/988ede94/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml b/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml index 78b9ee7..5981468 100644 --- a/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml +++ b/flume-checkstyle/src/main/resources/flume/checkstyle-suppressions.xml @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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"> http://git-wip-us.apache.org/repos/asf/flume/blob/988ede94/flume-checkstyle/src/main/resources/flume/checkstyle.xml ---------------------------------------------------------------------- diff --git a/flume-checkstyle/src/main/resources/flume/checkstyle.xml b/flume-checkstyle/src/main/resources/flume/checkstyle.xml index fdbcb5d..7035e09 100644 --- a/flume-checkstyle/src/main/resources/flume/checkstyle.xml +++ b/flume-checkstyle/src/main/resources/flume/checkstyle.xml @@ -1,4 +1,23 @@ <?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 module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
