This is an automated email from the ASF dual-hosted git repository.

bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 9557840  NIFI-6912: Add profiles to Hive 3 NAR to optionally include 
additional Hadoop libs
9557840 is described below

commit 955784031fcd00e40cd43c86a4cde22dd4d2713a
Author: Matthew Burgess <[email protected]>
AuthorDate: Wed Nov 27 13:03:23 2019 -0500

    NIFI-6912: Add profiles to Hive 3 NAR to optionally include additional 
Hadoop libs
    
    This closes #3907.
---
 .../nifi-hive-bundle/nifi-hive3-nar/pom.xml        | 66 ++++++++++++++++++++++
 .../src/main/resources/META-INF/LICENSE            | 20 ++++++-
 .../src/main/resources/META-INF/NOTICE             | 14 +++++
 3 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml 
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
index 8ab2000..09c3736 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
@@ -46,4 +46,70 @@
         </dependency>
     </dependencies>
 
+    <profiles>
+        <!-- Includes hadoop-aws for accessing HDFS with an s3a:// filesystem 
-->
+        <profile>
+            <id>include-hadoop-aws</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-aws</artifactId>
+                    <version>${hadoop.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!-- Includes hadoop-azure and hadoop-azure-datalake for accessing 
HDFS with wasb://, abfs://, and adl:// filesystems -->
+        <profile>
+            <id>include-hadoop-azure</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-azure</artifactId>
+                    <version>${hadoop.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>com.google.guava</groupId>
+                            <artifactId>guava</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-core</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-azure-datalake</artifactId>
+                    <version>${hadoop.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-core</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!-- Includes hadoop-cloud-storage -->
+        <profile>
+            <id>include-hadoop-cloud-storage</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-cloud-storage</artifactId>
+                    <version>${hadoop.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
diff --git 
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/LICENSE
 
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/LICENSE
index 90a0609..8847e3f 100644
--- 
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/LICENSE
+++ 
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/LICENSE
@@ -389,4 +389,22 @@ licenses.
     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
-    SOFTWARE.
\ No newline at end of file
+    SOFTWARE.
+
+    The binary distribution of this product bundles 'Azure SDK for Java' which 
is available under an MIT license.
+
+        Copyright (c) 2015 Microsoft Azure
+
+        Permission is hereby granted, free of charge, to any person obtaining 
a copy of this software and
+        associated documentation files (the Software), to deal in the Software 
without restriction, including
+        without limitation the rights to use, copy, modify, merge, publish, 
distribute, sublicense, and/or
+        sell copies of the Software, and to permit persons to whom the 
Software is furnished to do so, subject
+        to the following conditions:
+
+        The above copyright notice and this permission notice shall be 
included in all copies or substantial portions of the Software.
+
+        THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
+        LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT. IN
+        NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
CLAIM, DAMAGES OR OTHER LIABILITY,
+        WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
OF OR IN CONNECTION WITH THE
+        SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git 
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE
index 10c9c61..fda86db 100644
--- 
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE
@@ -330,6 +330,20 @@ The following binary components are provided under the 
Apache Software License v
     The following NOTICE information applies:
       Copyright 2003-2006 Greg Luck
 
+  (ASLv2) Amazon Web Services SDK
+        The following NOTICE information applies:
+          Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights 
Reserved.
+
+          This product includes software developed by
+          Amazon Technologies, Inc (http://www.amazon.com/).
+
+          **********************
+          THIRD PARTY COMPONENTS
+          **********************
+          This software includes third party software subject to the following 
copyrights:
+          - XML parsing and utility functions from JetS3t - Copyright 
2006-2009 James Murty.
+          - PKCS#1 PEM encoded private key parsing and utility functions from 
oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
+
   ************************
   Common Development and Distribution License 1.1
   ************************

Reply via email to