Repository: falcon Updated Branches: refs/heads/master 9cd986efb -> f46b1f5d9
FALCON-1003 Update checkstyle to remove DoubleCheckedLocking. Contributed by Pallavi Rao Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f46b1f5d Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f46b1f5d Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f46b1f5d Branch: refs/heads/master Commit: f46b1f5d9fd9a6ce60985fdf2dd15d8ec43395a4 Parents: 9cd986e Author: Suhas Vasu <[email protected]> Authored: Fri Feb 20 14:37:54 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Fri Feb 20 14:37:54 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../falcon/checkstyle-suppressions.xml | 26 ++++++++++++++++++++ .../src/main/resources/falcon/checkstyle.xml | 4 ++- .../src/main/resources/errorMapping.properties | 3 ++- .../src/main/resources/log4testng.properties | 3 ++- .../ReplicationResources/log4testng.properties | 3 ++- pom.xml | 1 + webapp/src/test/resources/client.properties | 3 ++- 8 files changed, 41 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/f46b1f5d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ce8e5b3..959e4a2 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,9 @@ Trunk (Unreleased) FALCON-949 Force update feature (pavan kumar kolamuri via Suhas Vasu) IMPROVEMENTS + FALCON-1003 Update checkstyle to remove DoubleCheckedLocking + (Pallavi Rao via Suhas Vasu) + FALCON-1012 Add support for MapR-FS (Roman Slysh via Suhas Vasu) FALCON-774 Discontinue support for JDK 1.6 and move to 1.7. (Peeyush http://git-wip-us.apache.org/repos/asf/falcon/blob/f46b1f5d/checkstyle/src/main/resources/falcon/checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/checkstyle/src/main/resources/falcon/checkstyle-suppressions.xml b/checkstyle/src/main/resources/falcon/checkstyle-suppressions.xml new file mode 100644 index 0000000..3b75811 --- /dev/null +++ b/checkstyle/src/main/resources/falcon/checkstyle-suppressions.xml @@ -0,0 +1,26 @@ +<?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 suppressions PUBLIC +"-//Puppy Crawl//DTD Suppressions 1.1//EN" +"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd";> + +<suppressions> + <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/> + <suppress files="[\\/]surefire-reports[\\/]" checks="[a-zA-Z0-9]*"/> +</suppressions> http://git-wip-us.apache.org/repos/asf/falcon/blob/f46b1f5d/checkstyle/src/main/resources/falcon/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle/src/main/resources/falcon/checkstyle.xml b/checkstyle/src/main/resources/falcon/checkstyle.xml index f6df5cd..def097c 100644 --- a/checkstyle/src/main/resources/falcon/checkstyle.xml +++ b/checkstyle/src/main/resources/falcon/checkstyle.xml @@ -63,6 +63,7 @@ <!-- See http://checkstyle.sf.net/config_header.html --> <module name="Header"> <property name="headerFile" value="${checkstyle.header.file}"/> + <property name="fileExtensions" value="java"/> </module> <module name="FileLength"/> @@ -172,7 +173,8 @@ <!-- Checks for common coding problems --> <!-- See http://checkstyle.sf.net/config_coding.html --> <!-- module name="AvoidInlineConditionals"/--> - <module name="DoubleCheckedLocking"/> + <!-- DoubleCheckedLocking check is no longer required. See http://checkstyle.sourceforge.net/releasenotes.html --> + <!-- module name="DoubleCheckedLocking"/--> <module name="EmptyStatement"/> <module name="EqualsHashCode"/> <module name="StringLiteralEquality"/> http://git-wip-us.apache.org/repos/asf/falcon/blob/f46b1f5d/falcon-regression/merlin/src/main/resources/errorMapping.properties ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/resources/errorMapping.properties b/falcon-regression/merlin/src/main/resources/errorMapping.properties index 3ed3cea..a6adf51 100644 --- a/falcon-regression/merlin/src/main/resources/errorMapping.properties +++ b/falcon-regression/merlin/src/main/resources/errorMapping.properties @@ -22,4 +22,5 @@ noExecutionSpecified.xml=javax.xml.bind.UnmarshalException - with linked excepti NoWorkflowParams.xml=javax.xml.bind.UnmarshalException - with linked exception:[org.xml.sax.SAXParseException; lineNumber: 52; columnNumber: 71; cvc-complex-type.2.4.a: Invalid content was found starting with element 'retry'. One of '{workflow}' is expected.] process-invalid.xml=javax.xml.bind.UnmarshalException - with linked exception:[org.xml.sax.SAXParseException; lineNumber: 2; columnNumber: 72; cvc-elt.1: Cannot find the declaration of element 'Process'.] inValid01_sameName.xml=inValid01_sameName already exists -inValid02_sameName.xml=inValid02_sameName already exists \ No newline at end of file +inValid02_sameName.xml=inValid02_sameName already exists + http://git-wip-us.apache.org/repos/asf/falcon/blob/f46b1f5d/falcon-regression/merlin/src/main/resources/log4testng.properties ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/resources/log4testng.properties b/falcon-regression/merlin/src/main/resources/log4testng.properties index fd6f966..34b4bde 100644 --- a/falcon-regression/merlin/src/main/resources/log4testng.properties +++ b/falcon-regression/merlin/src/main/resources/log4testng.properties @@ -25,4 +25,5 @@ log4testng.logger.org.testng.reporters.EmailableReporter=TRACE # All Logger in packages below org.testng will log WARN level and above - log4testng.logger.org.testng=INFO \ No newline at end of file + log4testng.logger.org.testng=INFO + http://git-wip-us.apache.org/repos/asf/falcon/blob/f46b1f5d/falcon-regression/merlin/src/test/resources/ReplicationResources/log4testng.properties ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/ReplicationResources/log4testng.properties b/falcon-regression/merlin/src/test/resources/ReplicationResources/log4testng.properties index fd6f966..34b4bde 100644 --- a/falcon-regression/merlin/src/test/resources/ReplicationResources/log4testng.properties +++ b/falcon-regression/merlin/src/test/resources/ReplicationResources/log4testng.properties @@ -25,4 +25,5 @@ log4testng.logger.org.testng.reporters.EmailableReporter=TRACE # All Logger in packages below org.testng will log WARN level and above - log4testng.logger.org.testng=INFO \ No newline at end of file + log4testng.logger.org.testng=INFO + http://git-wip-us.apache.org/repos/asf/falcon/blob/f46b1f5d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bbb6e99..d290ebf 100644 --- a/pom.xml +++ b/pom.xml @@ -331,6 +331,7 @@ <includeTestSourceDirectory>true</includeTestSourceDirectory> <configLocation>falcon/checkstyle.xml</configLocation> <headerLocation>falcon/checkstyle-java-header.txt</headerLocation> + <suppressionsLocation>falcon/checkstyle-suppressions.xml</suppressionsLocation> <failOnViolation>true</failOnViolation> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/falcon/blob/f46b1f5d/webapp/src/test/resources/client.properties ---------------------------------------------------------------------- diff --git a/webapp/src/test/resources/client.properties b/webapp/src/test/resources/client.properties index c9eecf5..3f5c361 100644 --- a/webapp/src/test/resources/client.properties +++ b/webapp/src/test/resources/client.properties @@ -17,4 +17,5 @@ # falcon.url=http://localhost:41000/ -falcon.recipe.path=target/test-classes \ No newline at end of file +falcon.recipe.path=target/test-classes +
