Repository: nifi Updated Branches: refs/heads/master dc8b62c3a -> 2d6fec5fa
NIFI-865 mild cleanup for LICENSE NOTICE Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2d6fec5f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2d6fec5f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2d6fec5f Branch: refs/heads/master Commit: 2d6fec5fa9abfd64439cf89d8b11a6f53a205544 Parents: dc8b62c Author: joewitt <[email protected]> Authored: Tue Feb 2 21:13:28 2016 -0500 Committer: joewitt <[email protected]> Committed: Tue Feb 2 21:13:28 2016 -0500 ---------------------------------------------------------------------- .../nifi-amqp-nar/src/main/resources/META-INF/LICENSE | 9 --------- .../nifi-amqp-nar/src/main/resources/META-INF/NOTICE | 10 ---------- 2 files changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2d6fec5f/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/LICENSE index 3bf1dc6..6b0b127 100644 --- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/LICENSE @@ -201,12 +201,3 @@ See the License for the specific language governing permissions and limitations under the License. -APACHE NIFI SUBCOMPONENTS: - -The Apache NiFi project contains subcomponents with separate copyright -notices and license terms. Your use of the source code for the these -subcomponents is subject to the terms and conditions of the following -licenses. - -The binary distribution of this product bundles 'RabbitMQ Client API' which is -licensed under Apache Public License 2.0. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/2d6fec5f/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE index 64f7890..4085453 100644 --- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE @@ -4,13 +4,3 @@ Copyright 2015 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -****************** -Apache Software License v2 -****************** - -The following binary components are provided under the Apache Software License v2 - - (ASLv2) RabbitMQ Client API - The following NOTICE information applies: - RabbitMQ Client API - Copyright 2001-2015 The Apache Software Foundation
