You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mt...@apache.org on 2018/10/01 14:59:24 UTC
nifi git commit: NIFI-5650: Added Xerces to scripting bundle for
Jython 2.7.1
Repository: nifi
Updated Branches:
refs/heads/master b1478cdb1 -> 813cc1f6a
NIFI-5650: Added Xerces to scripting bundle for Jython 2.7.1
This closes #3042
Signed-off-by: Mike Thomsen <mi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/813cc1f6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/813cc1f6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/813cc1f6
Branch: refs/heads/master
Commit: 813cc1f6a25417c47eafd409089c7d2dec7ac12a
Parents: b1478cd
Author: Matthew Burgess <ma...@apache.org>
Authored: Mon Oct 1 10:23:44 2018 -0400
Committer: Mike Thomsen <mi...@gmail.com>
Committed: Mon Oct 1 10:57:58 2018 -0400
----------------------------------------------------------------------
.../src/main/resources/META-INF/NOTICE | 14 ++++++++++++++
.../nifi-scripting-processors/pom.xml | 6 ++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/813cc1f6/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 3e3622b..7495cb6 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
@@ -73,6 +73,20 @@ The following binary components are provided under the Apache Software License v
The original software and related information is available
at http://www.jcraft.com/jsch/.
+ (ASLv2) Apache Xerces Java
+ The following NOTICE information applies:
+ Copyright 1999-2018 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
+
******************
Eclipse Public License v1.0
******************
http://git-wip-us.apache.org/repos/asf/nifi/blob/813cc1f6/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 af104b2..925b2e2 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
@@ -96,6 +96,12 @@
<artifactId>metrics-core</artifactId>
<version>2.2.0</version>
</dependency>
+ <!-- For Jython 2.7.1 -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>