You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2017/05/19 04:38:22 UTC
nifi git commit: NIFI-3940 upgraded to latest jruby which resolves an
apparent lgpl bunding issue
Repository: nifi
Updated Branches:
refs/heads/master 28eadaa68 -> 3b98abbf4
NIFI-3940 upgraded to latest jruby which resolves an apparent lgpl bunding issue
This closes #1827.
Signed-off-by: Andy LoPresto <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3b98abbf
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3b98abbf
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3b98abbf
Branch: refs/heads/master
Commit: 3b98abbf416974a7e94ef4e1ca3fc169bbf66393
Parents: 28eadaa
Author: joewitt <jo...@apache.org>
Authored: Thu May 18 22:57:49 2017 -0400
Committer: Andy LoPresto <al...@apache.org>
Committed: Thu May 18 21:37:25 2017 -0700
----------------------------------------------------------------------
nifi-assembly/NOTICE | 2 +-
.../nifi-scripting-nar/src/main/resources/META-INF/NOTICE | 10 ++--------
.../nifi-scripting-processors/pom.xml | 6 +++---
3 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/3b98abbf/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index bd7ccc2..0873c21 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/)
http://git-wip-us.apache.org/repos/asf/nifi/blob/3b98abbf/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 b0f7909..219b534 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)
http://git-wip-us.apache.org/repos/asf/nifi/blob/3b98abbf/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 dbd1de6..6721d8a 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 @@
<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>