HCATALOG-586 checkstyle fails every time complaining that it's own header file does not have the proper header
git-svn-id: https://svn.apache.org/repos/asf/incubator/hcatalog/trunk@1428165 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 795b902..4096ac0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -170,6 +170,8 @@
OPTIMIZATIONS
BUG FIXES
+ HCAT-586 checkstyle fails every time complaining that it's own header file does not have the proper header (gates)
+
HCAT-580 Optimizations in HCAT-538 break e2e tests (daijy via gates)
HCAT-583 e2e tests do not build (gates)
diff --git a/build-support/ant/checkstyle.xml b/build-support/ant/checkstyle.xml
index 0044cd7..9ed82e4 100644
--- a/build-support/ant/checkstyle.xml
+++ b/build-support/ant/checkstyle.xml
@@ -50,11 +50,15 @@
<exclude name="README.txt"/>
<exclude name="RELEASE_NOTES.txt"/>
<exclude name="*.patch"/>
- <exclude name="**/*.swp"/> <!-- Don't hork on Alan's vim swap files -->
- <exclude name="src/test/e2e/**/*.pm"/> <!-- Exclude these for now because it's looking for Java style comments and failing. -->
- <exclude name="src/test/e2e/**/*.pl"/> <!-- Exclude these for now because it's looking for Java style comments and failing. -->
- <exclude name="src/test/e2e/**/*.xml"/> <!-- Exclude these for now because it's looking for Java style comments and failing. -->
- <exclude name="src/test/e2e/**/*.conf"/> <!-- Exclude these for now because it's looking for Java style comments and failing. -->
+ <exclude name="tags"/>
+ <exclude name="**/*.swp"/> <!-- vim swap files -->
+ <exclude name="**/*.orig"/> <!-- files created by patch -->
+ <exclude name="**/*.rej"/> <!-- files created by patch -->
+ <exclude name="src/test/e2e/harness/**"/> <!-- These aren't under hcat's control -->
+ <exclude name="src/test/e2e/hcatalog/testdist/**"/> <!-- Test run results -->
+ <exclude name="src/test/e2e/hcatalog/tar/**"/> <!-- Test build area -->
+ <exclude name="src/test/e2e/hcatalog/udfs/java/*.jar"/> <!-- Test build area -->
+ <exclude name="src/test/e2e/hcatalog/hcattests.tar"/> <!-- Test build artifact -->
</fileset>
<formatter type="plain"/>
<formatter type="xml" toFile="${build.dir}/checkstyle/checkstyle_result.xml"/>
diff --git a/build-support/checkstyle/apache_header.txt b/build-support/checkstyle/apache_header.txt
index 7e54f3d..718f9b5 100644
--- a/build-support/checkstyle/apache_header.txt
+++ b/build-support/checkstyle/apache_header.txt
@@ -1,19 +1,19 @@
^#!
^<\?(xml|xml-stylesheet).*>$
^\W*$
-^\W*Licensed to the Apache Software Foundation \(ASF\) under one$
-^\W*or more contributor license agreements. See the NOTICE file$
-^\W*distributed with this work for additional information$
-^\W*regarding copyright ownership. The ASF licenses this file$
-^\W*to you under the Apache License, Version 2.0 \(the$
-^\W*"License"\); you may not use this file except in compliance$
-^\W*with the License. You may obtain a copy of the License at$
-^\W*$
-^\W*http://www.apache.org/licenses/LICENSE-2.0$
-^\W*$
-^\W*Unless required by applicable law or agreed to in writing,$
-^\W*software distributed under the License is distributed on an$
-^\W*"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
-^\W*KIND, either express or implied. See the License for the$
-^\W*specific language governing permissions and limitations$
-^\W*under the License.$
+\W*Licensed to the Apache Software Foundation \(ASF\) under one$
+\W*or more contributor license agreements. See the NOTICE file$
+\W*distributed with this work for additional information$
+\W*regarding copyright ownership. The ASF licenses this file$
+\W*to you under the Apache License, Version 2.0 \(the$
+\W*"License"\); you may not use this file except in compliance$
+\W*with the License. You may obtain a copy of the License at$
+\W*$
+\W*http://www.apache.org/licenses/LICENSE-2.0$
+\W*$
+\W*Unless required by applicable law or agreed to in writing,$
+\W*software distributed under the License is distributed on an$
+\W*"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY$
+\W*KIND, either express or implied. See the License for the$
+\W*specific language governing permissions and limitations$
+\W*under the License.$
diff --git a/build-support/checkstyle/apache_header_java.txt b/build-support/checkstyle/apache_header_java.txt
deleted file mode 100644
index 5d5f1e3..0000000
--- a/build-support/checkstyle/apache_header_java.txt
+++ /dev/null
@@ -1,17 +0,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.
- */
diff --git a/webhcat/svr/src/main/bin/webhcat_server.sh b/webhcat/svr/src/main/bin/webhcat_server.sh
index cbbe2ad..21d3285 100644
--- a/webhcat/svr/src/main/bin/webhcat_server.sh
+++ b/webhcat/svr/src/main/bin/webhcat_server.sh
@@ -10,12 +10,12 @@
#
# 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.
-
+# 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.
#
# Support functions
#
