Repository: nifi Updated Branches: refs/heads/master a2a8fcb31 -> e439cfef1
NIFI-4389: This closes #2368. Add Ivy to scripting NARs for Grape/Grab in Groovy Signed-off-by: joewitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e439cfef Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e439cfef Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e439cfef Branch: refs/heads/master Commit: e439cfef1010af9ad8b8360fe66626aefee9ef02 Parents: a2a8fcb Author: Matthew Burgess <[email protected]> Authored: Wed Jan 3 13:46:30 2018 -0500 Committer: joewitt <[email protected]> Committed: Thu Jan 4 10:20:47 2018 -0500 ---------------------------------------------------------------------- nifi-assembly/NOTICE | 19 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 19 +++++++++++++++++++ .../nifi-groovyx-processors/pom.xml | 5 +++++ .../src/main/resources/META-INF/NOTICE | 18 ++++++++++++++++++ .../nifi-scripting-processors/pom.xml | 5 +++++ 5 files changed, 66 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e439cfef/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index c2784a8..bcec06d 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 ************************ http://git-wip-us.apache.org/repos/asf/nifi/blob/e439cfef/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- 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 90b232e..7e8d458 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/. + http://git-wip-us.apache.org/repos/asf/nifi/blob/e439cfef/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml ---------------------------------------------------------------------- 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 1a56eaa..9df21f3 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 @@ -42,6 +42,11 @@ <version>2.4.12</version> </dependency> <dependency> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + <version>2.4.0</version> + </dependency> + <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-dbcp-service-api</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/nifi/blob/e439cfef/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- 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 ffc8eb4..2367564 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 ****************** http://git-wip-us.apache.org/repos/asf/nifi/blob/e439cfef/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml ---------------------------------------------------------------------- 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 67bc87c..10572b2 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 @@ -55,6 +55,11 @@ <artifactId>groovy-all</artifactId> </dependency> <dependency> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + <version>2.4.0</version> + </dependency> + <dependency> <groupId>org.scijava</groupId> <artifactId>jython-shaded</artifactId> <version>2.7.1</version>
