From 70216e79785d9596e320b174e08427947cf65ff3 Mon Sep 17 00:00:00 2001
From: Xiaoyu Yao <xyao@apache.org>
Date: Tue, 27 Mar 2018 11:26:43 -0700
Subject: [PATCH] HDFS-13340. Ozone: Fix false positive RAT warning when
 project built without hds/cblock. Contributed by Elek Marton.

---
 hadoop-cblock/server/pom.xml                    | 10 ----------
 .../dynamicprovisioner/expected1-pv.json        | 17 +++++++++++++++++
 .../dynamicprovisioner/input1-pvc.json          | 17 +++++++++++++++++
 .../common/dev-support/findbugsExcludeFile.xml  | 17 +++++++++++++++++
 hadoop-ozone/pom.xml                            |  2 --
 pom.xml                                         |  1 +
 6 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/hadoop-cblock/server/pom.xml b/hadoop-cblock/server/pom.xml
index 17af85db6c..3fa197d367 100644
--- a/hadoop-cblock/server/pom.xml
+++ b/hadoop-cblock/server/pom.xml
@@ -109,16 +109,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>src/test/resources/dynamicprovisioner/expected1-pv.json</exclude>
-            <exclude>src/test/resources/dynamicprovisioner/input1-pvc.json</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-maven-plugins</artifactId>
diff --git a/hadoop-cblock/server/src/test/resources/dynamicprovisioner/expected1-pv.json b/hadoop-cblock/server/src/test/resources/dynamicprovisioner/expected1-pv.json
index 2f8a193c8f..569de61e4a 100644
--- a/hadoop-cblock/server/src/test/resources/dynamicprovisioner/expected1-pv.json
+++ b/hadoop-cblock/server/src/test/resources/dynamicprovisioner/expected1-pv.json
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
 {
     "apiVersion": "v1",
     "kind": "PersistentVolume",
diff --git a/hadoop-cblock/server/src/test/resources/dynamicprovisioner/input1-pvc.json b/hadoop-cblock/server/src/test/resources/dynamicprovisioner/input1-pvc.json
index e40ba71ee3..02815be8fd 100644
--- a/hadoop-cblock/server/src/test/resources/dynamicprovisioner/input1-pvc.json
+++ b/hadoop-cblock/server/src/test/resources/dynamicprovisioner/input1-pvc.json
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
 {
     "apiVersion": "v1",
     "kind": "PersistentVolumeClaim",
diff --git a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml b/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
index 3f0cd34710..df58f3650a 100644
--- a/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-ozone/common/dev-support/findbugsExcludeFile.xml
@@ -1,3 +1,20 @@
+<?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.
+-->
 <FindBugsFilter>
   <Match>
     <Package name="org.apache.hadoop.ozone.protocol.proto"/>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 1e7ce2c981..33e489afc9 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -55,8 +55,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
           <excludes>
             <exclude>.gitattributes</exclude>
             <exclude>.idea/**</exclude>
-
-            <exclude>dev-support/findbugsExcludeFile.xml</exclude>
             <exclude>dev-support/checkstyle*</exclude>
             <exclude>dev-support/jdiff/**</exclude>
             <exclude>dev-support/*tests</exclude>
diff --git a/pom.xml b/pom.xml
index 9a59f0c69b..7c63346364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -386,6 +386,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <exclude>**/build/**</exclude>
             <exclude>**/patchprocess/**</exclude>
             <exclude>**/*.js</exclude>
+            <exclude>hadoop-hdsl/**/nvd3-*</exclude>
          </excludes>
        </configuration>
       </plugin>