You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/11/09 04:37:34 UTC

[1/2] nifi git commit: NIFI-925 - Upgrade to hadoop 2.6.2. This closes #83.

Repository: nifi
Updated Branches:
  refs/heads/master 440e4c494 -> 64b1fc983


NIFI-925 - Upgrade to hadoop 2.6.2.  This closes #83.

Signed-off-by: joewitt <jo...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/de498df4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/de498df4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/de498df4

Branch: refs/heads/master
Commit: de498df4c997c6e51c1031726e5d1f412e62ff5a
Parents: 440e4c4
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Nov 7 18:57:32 2015 +0100
Committer: joewitt <jo...@apache.org>
Committed: Sun Nov 8 22:10:30 2015 -0500

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/de498df4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 08a227f..d563408 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
         <spring.version>4.1.6.RELEASE</spring.version>
         <spring.security.version>3.2.7.RELEASE</spring.security.version>
         <jersey.version>1.19</jersey.version>
-        <hadoop.version>2.6.0</hadoop.version>
+        <hadoop.version>2.6.2</hadoop.version>
         <yammer.metrics.version>2.2.0</yammer.metrics.version>
     </properties>
     <dependencyManagement>


[2/2] nifi git commit: NIFI-925 reviewed patch/ builds well/ fixed licensing gaps.

Posted by jo...@apache.org.
NIFI-925 reviewed patch/ builds well/ fixed licensing gaps.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/64b1fc98
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/64b1fc98
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/64b1fc98

Branch: refs/heads/master
Commit: 64b1fc983c09d09fd5d8aa7ecd39d4bc487f8094
Parents: de498df
Author: joewitt <jo...@apache.org>
Authored: Sun Nov 8 22:15:11 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Sun Nov 8 22:15:11 2015 -0500

----------------------------------------------------------------------
 nifi-assembly/NOTICE                            | 27 +++++++++++++++++
 .../src/main/resources/META-INF/NOTICE          | 32 ++++++++++++++++++++
 2 files changed, 59 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/64b1fc98/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 1f7e3f1..495c74c 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -323,11 +323,34 @@ The following binary components are provided under the Apache Software License v
       Apache Commons Daemon
       Copyright 1999-2013 The Apache Software Foundation
 
+  (ASLv2) Apache Commons EL
+    The following NOTICE information applies:
+      Apache Commons EL
+      Copyright 1999-2007 The Apache Software Foundation
+
+      EL-8 patch - Copyright 2004-2007 Jamie Taylor
+      http://issues.apache.org/jira/browse/EL-8
+
   (ASLv2) Jetty
     The following NOTICE information applies:
        Jetty Web Container
        Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
 
+  (ASLv2) Apache Tomcat
+    The following NOTICE information applies:
+      Apache Tomcat
+      Copyright 2007 The Apache Software Foundation
+
+        Java Management Extensions (JMX) support is provided by
+        the MX4J package, which is open source software.  The
+        original software and related information is available
+        at http://mx4j.sourceforge.net.
+
+        Java compilation software for JSP pages is provided by Eclipse, 
+        which is open source software.  The orginal software and 
+        related infomation is available at
+        http://www.eclipse.org.
+
   (ASLv2) Apache Kafka
     The following NOTICE information applies:
       Apache Kafka
@@ -558,6 +581,10 @@ The following binary components are provided under the Apache Software License v
       Swagger Core 1.5.3-M1
       Copyright 2015 Reverb Technologies, Inc.
 
+  (ASLv2) Google GSON
+    The following NOTICE information applies:
+      Copyright 2008 Google Inc.
+
   (ASLv2) JSON-SMART
     The following NOTICE information applies:
       Copyright 2011 JSON-SMART authors

http://git-wip-us.apache.org/repos/asf/nifi/blob/64b1fc98/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE
index 7f1f51d..87e34ce 100644
--- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE
@@ -254,6 +254,34 @@ The following binary components are provided under the Apache Software License v
           Apache Software Foundation that were originally developed at iClick, Inc.,
           software copyright (c) 1999.
 
+  (ASLv2) Apache Commons EL
+    The following NOTICE information applies:
+      Apache Commons EL
+      Copyright 1999-2007 The Apache Software Foundation
+
+      EL-8 patch - Copyright 2004-2007 Jamie Taylor
+      http://issues.apache.org/jira/browse/EL-8
+
+   (ASLv2) Jetty
+     The following NOTICE information applies:
+        Jetty Web Container
+        Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
+
+  (ASLv2) Apache Tomcat
+    The following NOTICE information applies:
+      Apache Tomcat
+      Copyright 2007 The Apache Software Foundation
+
+        Java Management Extensions (JMX) support is provided by
+        the MX4J package, which is open source software.  The
+        original software and related information is available
+        at http://mx4j.sourceforge.net.
+
+        Java compilation software for JSP pages is provided by Eclipse,
+        which is open source software.  The orginal software and
+        related infomation is available at
+        http://www.eclipse.org.
+
   (ASLv2) Google Guice
     The following NOTICE information applies:
       Google Guice - Core Library
@@ -262,6 +290,10 @@ The following binary components are provided under the Apache Software License v
       Google Guice - Extensions - Servlet
       Copyright 2006-2011 Google, Inc.
 
+  (ASLv2) Google GSON
+    The following NOTICE information applies:
+      Copyright 2008 Google Inc.
+
 ************************
 Common Development and Distribution License 1.1
 ************************