You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/04 19:57:12 UTC
[18/36] incubator-nifi git commit: NIFI-291 completed incorporation
of Elser feedback
NIFI-291 completed incorporation of Elser feedback
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d926aca9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d926aca9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d926aca9
Branch: refs/heads/NIFI-250
Commit: d926aca951b8169b0c32a583a178dedb6e1dc605
Parents: 2c2d39c
Author: joewitt <jo...@apache.org>
Authored: Tue Feb 3 09:41:27 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Feb 3 09:41:27 2015 -0500
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index c901e36..7bbc4dd 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.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/nifi-nar-maven-plugin/README.md
----------------------------------------------------------------------
diff --git a/nifi-nar-maven-plugin/README.md b/nifi-nar-maven-plugin/README.md
index 941de2b..1b554d9 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.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/nifi-nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index 79e437e..6f46397 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>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/nifi-site/README.md
----------------------------------------------------------------------
diff --git a/nifi-site/README.md b/nifi-site/README.md
index 45276e1..05cabd0 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).
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/nifi/README.md
----------------------------------------------------------------------
diff --git a/nifi/README.md b/nifi/README.md
index e077c0c..70bf7ef 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.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d926aca9/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 499ffd6..fb73f9c 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>