From 51b34a060ca9b59509360d5eb57a8ac325023142 Mon Sep 17 00:00:00 2001
From: David Moravek <david.moravek@gmail.com>
Date: Mon, 2 Feb 2015 09:48:18 +0100
Subject: [PATCH 1/4] NIFI-269: fix OSX build

---
 nifi/nifi-assembly/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml
index bc39b79cfb..a3bcadc1e1 100644
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@ -43,6 +43,7 @@
                             <descriptors>
                                 <descriptor>src/main/assembly/dependencies.xml</descriptor>
                             </descriptors>
+                            <tarLongFileMode>posix</tarLongFileMode>
                         </configuration>
                     </execution>
                 </executions>    

From 2c2d39c7a24dc77a84e1e095280239e0d56c8357 Mon Sep 17 00:00:00 2001
From: joewitt <joewitt@apache.org>
Date: Tue, 3 Feb 2015 08:18:58 -0500
Subject: [PATCH 2/4] NIFI-269 removed declaration of gnu tar form from parent
 pom

---
 nifi/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nifi/pom.xml b/nifi/pom.xml
index 765ef1bdd7..499ffd62e5 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -842,9 +842,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>2.5.2</version>
-                    <configuration>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>

From d926aca951b8169b0c32a583a178dedb6e1dc605 Mon Sep 17 00:00:00 2001
From: joewitt <joewitt@apache.org>
Date: Tue, 3 Feb 2015 09:41:27 -0500
Subject: [PATCH 3/4] NIFI-291 completed incorporation of Elser feedback

---
 README.md                       | 14 ++++++++++++++
 nifi-nar-maven-plugin/README.md | 14 ++++++++++++++
 nifi-nar-maven-plugin/pom.xml   |  6 +++---
 nifi-site/README.md             | 14 ++++++++++++++
 nifi/README.md                  | 14 ++++++++++++++
 nifi/pom.xml                    | 16 ++++++++--------
 6 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index c901e3697b..7bbc4dd327 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,17 @@
+<!--
+  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.
+-->
 # Apache NiFi
 
 Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently apart of the Apache Incubator.
diff --git a/nifi-nar-maven-plugin/README.md b/nifi-nar-maven-plugin/README.md
index 941de2b1e5..1b554d9153 100644
--- a/nifi-nar-maven-plugin/README.md
+++ b/nifi-nar-maven-plugin/README.md
@@ -1,3 +1,17 @@
+<!--
+  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.
+-->
 # Apache NiFi NAR Maven Plugin
 
 Apache NiFi NAR Maven Plugin helps to build NiFi Archive bundles to support the classloader isolation model of NiFi.
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index 79e437eeb5..6f46397de4 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -206,9 +206,9 @@
                 <artifactId>apache-rat-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>nb-configuration.xml</exclude>
-                        <exclude>nbactions.xml</exclude>
-                        <exclude>DEPENDENCIES</exclude>
+                        <exclude>nb-configuration.xml</exclude> <!-- convenience exclude for netbeans users -->
+                        <exclude>nbactions.xml</exclude> <!-- convenience excludes for netbeans users -->
+                        <exclude>DEPENDENCIES</exclude> <!-- auto generated by maven while building sources zip and more -->
                     </excludes>
                 </configuration>
             </plugin>
diff --git a/nifi-site/README.md b/nifi-site/README.md
index 45276e1aa6..05cabd087e 100644
--- a/nifi-site/README.md
+++ b/nifi-site/README.md
@@ -1,3 +1,17 @@
+<!--
+  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.
+-->
 # About
 [Apache NiFi project] (http://nifi.incubator.apache.org).
 
diff --git a/nifi/README.md b/nifi/README.md
index e077c0c791..70bf7ef822 100644
--- a/nifi/README.md
+++ b/nifi/README.md
@@ -1,3 +1,17 @@
+<!--
+  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.
+-->
 # Apache NiFi
 
 Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently apart of the Apache Incubator.
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 499ffd62e5..fb73f9caab 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -956,15 +956,15 @@
                 <artifactId>apache-rat-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>src/main/webapp/js/json2.js</exclude>
-                        <exclude>src/main/webapp/js/jquery/</exclude>
-                        <exclude>src/main/webapp/js/d3/d3.min.js</exclude>
-                        <exclude>src/main/webapp/js/codemirror/</exclude>
-                        <exclude>src/main/webapp/css/reset.css</exclude>
+                        <exclude>src/main/webapp/js/json2.js</exclude> <!-- license/notice accounted for -->
+                        <exclude>src/main/webapp/js/jquery/</exclude> <!-- license/notice accounted for -->
+                        <exclude>src/main/webapp/js/d3/d3.min.js</exclude> <!-- license/notice accounted for -->
+                        <exclude>src/main/webapp/js/codemirror/</exclude> <!-- license/notice accounted for -->
+                        <exclude>src/main/webapp/css/reset.css</exclude> <!-- license/notice accounted for -->
                         <exclude>src/test/resources/</exclude> <!-- Test datasets -->
-                        <exclude>nb-configuration.xml</exclude>
-                        <exclude>nbactions.xml</exclude>
-                        <exclude>DEPENDENCIES</exclude>
+                        <exclude>nb-configuration.xml</exclude><!-- courtesy exclude for netbeans users -->
+                        <exclude>nbactions.xml</exclude> <!-- courtesy exclude for netbeans users -->
+                        <exclude>DEPENDENCIES</exclude> <!-- auto generated file by maven while building sources.zip -->
                     </excludes>
                 </configuration>
             </plugin>

From a738be8f27e86fab7cf8c7bd23285fb9cb016cad Mon Sep 17 00:00:00 2001
From: joewitt <joewitt@apache.org>
Date: Tue, 3 Feb 2015 09:43:19 -0500
Subject: [PATCH 4/4] NIFI-291 completed incorporation of Purtell feedback

---
 nifi-nar-maven-plugin/pom.xml | 2 +-
 nifi/pom.xml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index 6f46397de4..7ba2d7c002 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -27,7 +27,7 @@
     <version>1.0.1-incubating-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
     <description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
-    <url>http://nifi.incubator.apache.org/maven-site/</url>
+    <url>http://nifi.incubator.apache.org</url>
     <organization>
         <name>Apache NiFi (incubating)</name>
         <url>http://nifi.incubator.apache.org/</url>
diff --git a/nifi/pom.xml b/nifi/pom.xml
index fb73f9caab..8eda68297d 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -26,7 +26,7 @@
     <version>0.0.2-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator.</description>
-    <url>http://nifi.incubator.apache.org/maven-site/</url>
+    <url>http://nifi.incubator.apache.org</url>
     <organization>
         <name>Apache NiFi (incubating)</name>
         <url>http://nifi.incubator.apache.org/</url>