From 3b98abbf416974a7e94ef4e1ca3fc169bbf66393 Mon Sep 17 00:00:00 2001 From: joewitt Date: Thu, 18 May 2017 22:57:49 -0400 Subject: [PATCH] NIFI-3940 upgraded to latest jruby which resolves an apparent lgpl bunding issue This closes #1827. Signed-off-by: Andy LoPresto --- nifi-assembly/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 10 ++-------- .../nifi-scripting-processors/pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index bd7ccc2629..0873c21b73 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -1348,7 +1348,7 @@ The following binary components are provided under the Eclipse Public License 1. (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html) (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.2.3 - http://logback.qos.ch/) (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.2.3 - http://logback.qos.ch/) - (EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete:9.0.4.0 - http://jruby.org). + (EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete:9.1.9.0 - http://jruby.org). (EPL 1.0) Eclipse Paho MQTT Client (org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2 - https://github.com/eclipse/paho.mqtt.java) (EPL 1.0) Eclipse Link (org.eclipse.persistence:eclipselink:2.5.2 - http://www.eclipse.org/eclipselink/) (EPL 1.0) Common Service Data Objects (org.eclipse.persistence:commonj.sdo:2.1.1 - http://www.eclipse.org/eclipselink/) 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 b0f7909aaf..219b534939 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 @@ -53,11 +53,5 @@ Eclipse Public License v1.0 The following binary components are provided under a EPL v1.0 license - (EPLv1.0) JRuby (org.jruby:jruby-complete:9.0.4.0 - http://jruby.org). - - JRuby is licensed under three licenses - the EPL 1.0, GPL 2 and LGPL 2.1. Apache NiFi uses the EPL v1.0 license. - - The following NOTICE information applies: - Copyright (c) 2007-2015 The JRuby project - - (EPLv1.0) Clojure (org.clojure:clojure:1.8.0 - http://clojure.org) + (EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete:9.1.9.0 - http://jruby.org). + (EPLv1.0) Clojure (org.clojure:clojure:1.8.0 - http://clojure.org) 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 dbd1de6716..6721d8a457 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 @@ -51,8 +51,8 @@ groovy-all - org.python - jython-standalone + org.scijava + jython-shaded 2.7.0 @@ -63,7 +63,7 @@ org.jruby jruby-complete - 9.0.4.0 + 9.1.9.0 org.clojure