Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3940 upgraded to latest jruby which resolves an apparent lgpl bunding issue 

This closes #1827.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
This commit is contained in:
joewitt 2017-05-18 22:57:49 -04:00 committed by Andy LoPresto
parent 28eadaa683
commit 3b98abbf41
No known key found for this signature in database
GPG Key ID: 6EC293152D90B61D
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-assembly/NOTICE
View File

@ -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/)

10
nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
View File

@ -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)

6
nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
View File

@ -51,8 +51,8 @@
<artifactId>groovy-all</artifactId>
</dependency>
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
<groupId>org.scijava</groupId>
<artifactId>jython-shaded</artifactId>
<version>2.7.0</version>
</dependency>
<dependency>
@ -63,7 +63,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>9.0.4.0</version>
<version>9.1.9.0</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>