Repository: nifi Updated Branches: refs/heads/master c8fc1327e -> 07ad132a2
NIFI-5596 Upgraded splunk-sdk-java version NIFI-5596 Updated L&N L&N commit added by Mike Thomsen Signed-off-by: Mike Thomsen <mikerthom...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/07ad132a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/07ad132a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/07ad132a Branch: refs/heads/master Commit: 07ad132a2bded79e7b08019ad683388eac1604d5 Parents: c8fc132 Author: Mohit Garg <mohig...@adobe.com> Authored: Sun Sep 16 15:53:56 2018 +0530 Committer: Mike Thomsen <mikerthom...@gmail.com> Committed: Mon Sep 17 12:52:17 2018 -0400 ---------------------------------------------------------------------- .../src/main/resources/META-INF/LICENSE | 16 +++++++++++ .../src/main/resources/META-INF/NOTICE | 30 +++++++++++++++++++- nifi-nar-bundles/nifi-splunk-bundle/pom.xml | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/07ad132a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/LICENSE index 86a150f..b7ed096 100644 --- a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/LICENSE @@ -231,3 +231,19 @@ licenses. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The binary distribution of this product bundles 'jBCrypt' which is available under an MIT + license. For details see https://github.com/svenkubiak/jBCrypt/blob/0.4.1/LICENSE + + Copyright (c) 2006 Damien Miller <d...@mindrot.org> + + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/07ad132a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/NOTICE index 3b330a2..6085826 100644 --- a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/NOTICE @@ -10,6 +10,23 @@ Apache Software License v2 The following binary components are provided under the Apache Software License v2 + (ASLv2) Apache Commons Codec + The following NOTICE information applies: + Apache Commons Codec + Copyright 2002-2014 The Apache Software Foundation + + src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java + contains test data from http://aspell.net/test/orig/batch0.tab. + Copyright (C) 2002 Kevin Atkinson (kev...@gnu.org) + + =============================================================================== + + The content of package org.apache.commons.codec.language.bm has been translated + from the original php source code available at http://stevemorse.org/phoneticinfo.htm + with permission from the original authors. + Original source copyright: + Copyright (c) 2008 Alexander Beider & Stephen P. Morse. + (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO @@ -44,4 +61,15 @@ The following binary components are provided under the Apache Software License v A list of contributors may be found from CREDITS file, which is included in some artifacts (usually source distributions); but is always available - from the source code management (SCM) system project uses. \ No newline at end of file + from the source code management (SCM) system project uses. + +Misc + + This product optionally depends on 'Bouncy Castle Crypto APIs' to generate + a temporary self-signed X.509 certificate when the JVM does not provide the + equivalent functionality. It can be obtained at: + + * LICENSE: + * license/LICENSE.bouncycastle.txt (MIT License) + * HOMEPAGE: + * http://www.bouncycastle.org/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/07ad132a/nifi-nar-bundles/nifi-splunk-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-splunk-bundle/pom.xml b/nifi-nar-bundles/nifi-splunk-bundle/pom.xml index 83a3e86..0f422d7 100644 --- a/nifi-nar-bundles/nifi-splunk-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-splunk-bundle/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>com.splunk</groupId> <artifactId>splunk</artifactId> - <version>1.5.0.0</version> + <version>1.6.3.0</version> </dependency> </dependencies> </dependencyManagement>