From e88c0d2e7081275197e52785fb51759d8a87735b Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Mon, 11 Jul 2016 14:15:43 -0400 Subject: [PATCH] Updating NOTICE files to have the correct licensing for the updated Event Hub client and it's dependencies. Also cleaned up pom dependency that is no longer needed. --- nifi-assembly/NOTICE | 21 ++++++++--- .../src/main/resources/META-INF/NOTICE | 35 +++++++------------ .../nifi-azure-processors/pom.xml | 4 --- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 0c2a4a5ab0..2c03d4c5c7 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -786,11 +786,7 @@ The following binary components are provided under the Apache Software License v is a distributed tracing system that is Apache 2.0 Licensed. Copyright 2012 Twitter, Inc. - (ASLv2) Apache Qpid AMQP 1.0 Client - The following NOTICE information applies: - Copyright 2006-2015 The Apache Software Foundation - (ASLv2) EventHubs Client (com.microsoft.eventhubs.client:eventhubs-client:0.9.1 - https://github.com/hdinsight/eventhubs-client/) (ASLv2) Groovy (org.codehaus.groovy:groovy:jar:2.4.5 - http://www.groovy-lang.org) The following NOTICE information applies: @@ -949,3 +945,20 @@ SIL OFL 1.1 The following binary components are provided under the SIL Open Font License 1.1 (SIL OFL 1.1) FontAwesome (4.6.1 - http://fortawesome.github.io/Font-Awesome/license/) + +************************ +MIT License +************************ +The following binary components are provided under the MIT License + + (MIT) Microsoft Azure IoT Device Libraries (com.microsoft.azure:azure-eventhubs:0.7.1 -- https://github.com/Azure/azure-event-hubs/) + This product includes software developed by Apache + Apache Qpid Proton 0.13.0 + (Apache 2.0 license) + The following NOTICE information applies: + Copyright 2006-2015 The Apache Software Foundation + + The product includes software developed by The Legion of the Bouncy Castle Inc. License (https://www.bouncycastle.org/licence.html) + (Bouncy Castle) Crytography library BCPKIX (org.bouncycastle:bcpkix-jdk15on:1.47 -- https://www.bouncycastle.org/java.html) + The following NOTICE information applies: + Copyright (c) 2000 - 2016 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE index 2b436790fa..b8ebc676c7 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE @@ -4,31 +4,20 @@ Copyright 2015-2016 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) Apache Commons Lang - The following NOTICE information applies: - Apache Commons Lang - Copyright 2001-2014 The Apache Software Foundation - - This product includes software from the Spring Framework, - under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - - (ASLv2) Apache Qpid AMQP 1.0 Client - The following NOTICE information applies: - Copyright 2006-2015 The Apache Software Foundation - - (ASLv2) EventHubs Client (com.microsoft.eventhubs.client:eventhubs-client:0.9.1 - https://github.com/hdinsight/eventhubs-client/) - ************************ -Common Development and Distribution License 1.1 +MIT License ************************ +The following binary components are provided under the MIT License -The following binary components are provided under the Common Development and Distribution License 1.1. See project link for details. + (MIT) Microsoft Azure IoT Device Libraries (com.microsoft.azure:azure-eventhubs:0.7.1 -- https://github.com/Azure/azure-event-hubs/) + This product includes software developed by Apache + Apache Qpid Proton 0.13.0 + (Apache 2.0 license) + The following NOTICE information applies: + Copyright 2006-2015 The Apache Software Foundation - (CDDL 1.1) (GPL2 w/ CPE) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - http://java.net/projects/jms-spec/pages/Home) + The product includes software developed by The Legion of the Bouncy Castle Inc. License (https://www.bouncycastle.org/licence.html) + (Bouncy Castle) Crytography library BCPKIX (org.bouncycastle:bcpkix-jdk15on:1.47 -- https://www.bouncycastle.org/java.html) + The following NOTICE information applies: + Copyright (c) 2000 - 2016 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml index 8abf52ff91..176938b0eb 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml @@ -32,10 +32,6 @@ org.apache.nifi nifi-processor-utils - - javax.jms - javax.jms-api - com.microsoft.azure azure-eventhubs