diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index c2784a8b19..bcec06d2af 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -1556,6 +1556,25 @@ The following binary components are provided under the Apache Software License v The following NOTICE information applies: Copyright (c) 2009-2011 Christian Kohlschütter + (ASLv2) Apache Ivy + The following NOTICE information applies: + Copyright 2007-2017 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + + Portions of Ivy were originally developed at + Jayasoft SARL (http://www.jayasoft.fr/) + and are licensed to the Apache Software Foundation under the + "Software Grant License Agreement" + + SSH and SFTP support is provided by the JCraft JSch package, + which is open source software, available under + the terms of a BSD style license. + The original software and related information is available + at http://www.jcraft.com/jsch/. + + ************************ Common Development and Distribution License 1.1 ************************ diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/src/main/resources/META-INF/NOTICE index 90b232e050..7e8d458bc0 100644 --- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/src/main/resources/META-INF/NOTICE @@ -12,3 +12,22 @@ The following binary components are provided under the Apache Software License v Apache Groovy Copyright 2003-2015 The Apache Software Foundation + +Apache Ivy + The following NOTICE information applies: + Copyright 2007-2017 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + + Portions of Ivy were originally developed at + Jayasoft SARL (http://www.jayasoft.fr/) + and are licensed to the Apache Software Foundation under the + "Software Grant License Agreement" + + SSH and SFTP support is provided by the JCraft JSch package, + which is open source software, available under + the terms of a BSD style license. + The original software and related information is available + at http://www.jcraft.com/jsch/. + diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml index 1a56eaa28a..9df21f3c1e 100644 --- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml +++ b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml @@ -41,6 +41,11 @@ groovy-all 2.4.12 + + org.apache.ivy + ivy + 2.4.0 + org.apache.nifi nifi-dbcp-service-api diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE index ffc8eb4c16..2367564990 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE @@ -55,6 +55,24 @@ The following binary components are provided under the Apache Software License v Expert Group and released to the public domain, as explained at http://creativecommons.org/publicdomain/zero/1.0/ + (ASLv2) Apache Ivy + The following NOTICE information applies: + Copyright 2007-2017 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + + Portions of Ivy were originally developed at + Jayasoft SARL (http://www.jayasoft.fr/) + and are licensed to the Apache Software Foundation under the + "Software Grant License Agreement" + + SSH and SFTP support is provided by the JCraft JSch package, + which is open source software, available under + the terms of a BSD style license. + The original software and related information is available + at http://www.jcraft.com/jsch/. + ****************** Eclipse Public License v1.0 ****************** diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml index 67bc87c8e7..10572b2e1d 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml @@ -54,6 +54,11 @@ org.codehaus.groovy groovy-all + + org.apache.ivy + ivy + 2.4.0 + org.scijava jython-shaded