NIFI-4428: Replaced JSON input with RecordReader
using per-record flowfiles
NIFI-4428: Added initial L&N, fixed dependency hierarchy

NIFI-4428: Exposed additional ZK properties

NIFI-4428: More work to reduce dependencies in Druid artifacts

NIFI-4428: Removed inaccessible attribute

NIFI-4428: Fixed typo in property description

NIFI-4428: Updates to Druid NAR L&N

NIFI-4428: Updated LICENSE to refer to ICU License for icu4j


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

Branch: refs/heads/HDF-3.1-maint
Commit: 45edd12a01628a9b6424d41457753fe16c6894a2
Parents: 46d30c7
Author: Matthew Burgess <[email protected]>
Authored: Wed Nov 22 11:36:30 2017 -0500
Committer: Matthew Burgess <[email protected]>
Committed: Tue Jan 16 13:46:16 2018 -0500

----------------------------------------------------------------------
 nifi-assembly/LICENSE                           |  90 +++
 nifi-assembly/NOTICE                            | 155 +++++
 .../record/util/DataTypeUtils.java              |  86 ++-
 .../serialization/record/TestDataTypeUtils.java | 134 +++-
 .../pom.xml                                     |  40 ++
 .../src/main/resources/META-INF/LICENSE         | 329 ++++++++++
 .../src/main/resources/META-INF/NOTICE          | 612 ++++++++++++++++++
 .../nifi-druid-controller-service-api/pom.xml   | 137 +++++
 .../api/druid/DruidTranquilityService.java      |  30 +
 .../nifi-druid-controller-service/pom.xml       |  56 ++
 .../druid/DruidTranquilityController.java       | 614 +++++++++++++++++++
 ...org.apache.nifi.controller.ControllerService |  16 +
 .../druid/DruidTranquilityControllerTest.java   | 100 +++
 .../nifi-druid-bundle/nifi-druid-nar/pom.xml    |  44 ++
 .../src/main/resources/META-INF/LICENSE         | 209 +++++++
 .../src/main/resources/META-INF/NOTICE          |   5 +
 .../nifi-druid-processors/pom.xml               |  74 +++
 .../nifi/processors/druid/PutDruidRecord.java   | 373 +++++++++++
 .../org.apache.nifi.processor.Processor         |  16 +
 .../druid/MockDruidTranquilityController.java   | 150 +++++
 .../processors/druid/PutDruidRecordTest.java    | 113 ++++
 nifi-nar-bundles/nifi-druid-bundle/pom.xml      |  56 ++
 nifi-nar-bundles/pom.xml                        |   1 +
 23 files changed, 3434 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-assembly/LICENSE
----------------------------------------------------------------------
diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE
index 8760829..0edf519 100644
--- a/nifi-assembly/LICENSE
+++ b/nifi-assembly/LICENSE
@@ -2073,3 +2073,93 @@ style license.
    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.
+
+  The binary distribution of this product bundles 'ANTLR 4' which is available
+    under a "3-clause BSD" license.  For details see 
http://www.antlr.org/license.html
+
+      Copyright (c) 2012 Terence Parr and Sam Harwell
+      All rights reserved.
+      Redistribution and use in source and binary forms, with or without 
modification, are permitted
+      provided that the following conditions are met:
+
+      Redistributions of source code must retain the above copyright notice, 
this list of
+      conditions and the following disclaimer.
+      Redistributions in binary form must reproduce the above copyright 
notice, this list of
+      conditions and the following disclaimer in the documentation and/or 
other materials
+      provided with the distribution.
+
+      Neither the name of the author nor the names of its contributors may be 
used to endorse
+      or promote products derived from this software without specific prior 
written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
IS" AND ANY
+      EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF
+      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN 
NO EVENT SHALL
+      THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
INCIDENTAL,
+      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
TO,
+      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
PROFITS; OR BUSINESS
+      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
CONTRACT,
+      STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
ANY WAY OUT OF
+      THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
DAMAGE.
+
+  The binary distribution of this product bundles 'icu4j'
+    which is available under a X-style license.
+
+      COPYRIGHT AND PERMISSION NOTICE
+
+      Copyright (c) 1995-2011 International Business Machines Corporation and 
others
+
+      All rights reserved.
+
+      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, and/or
+      sell copies of the Software, and to permit persons to whom the Software 
is furnished to do so,
+      provided that the above copyright notice(s) and this permission notice 
appear in all copies of
+      the Software and that both the above copyright notice(s) and this 
permission notice appear in
+      supporting documentation.
+
+      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 OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT 
HOLDER OR HOLDERS INCLUDED
+      IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR 
CONSEQUENTIAL DAMAGES, OR ANY
+      DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
IN AN ACTION OF CONTRACT,
+      NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION 
WITH THE USE OR PERFORMANCE
+      OF THIS SOFTWARE.
+
+      Except as contained in this notice, the name of a copyright holder shall 
not be used in advertising
+      or otherwise to promote the sale, use or other dealings in this Software 
without prior written
+      authorization of the copyright holder.
+
+  The binary distribution of this product bundles 'Scala Library, Scala 
Parser, Scala Reflect' which is available
+    under a "3-clause BSD" license.  For details see 
https://github.com/scala/scala/blob/v2.11.7/doc/LICENSE.md)
+
+      This software includes projects with other licenses -- see 
`doc/LICENSE.md`.
+
+      Copyright (c) 2002-2017 EPFL
+      Copyright (c) 2011-2017 Lightbend, Inc.
+
+      All rights reserved.
+
+      Redistribution and use in source and binary forms, with or without 
modification,
+      are permitted provided that the following conditions are met:
+
+        * Redistributions of source code must retain the above copyright 
notice,
+          this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above copyright 
notice,
+          this list of conditions and the following disclaimer in the 
documentation
+          and/or other materials provided with the distribution.
+        * Neither the name of the EPFL nor the names of its contributors
+          may be used to endorse or promote products derived from this software
+          without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+      "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+      A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
OWNER OR
+      CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+      EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+      PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+      LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+      NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+      SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index ac5456a..3f2a24c 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -1553,6 +1553,160 @@ The following binary components are provided under the 
Apache Software License v
         The following NOTICE information applies:
           DataStax Java Driver for Apache Cassandra - Core
           Copyright (C) 2012-2017 DataStax Inc.
+    (ASLv2) bytebuffer-collections
+        The following NOTICE information applies:
+          bytebuffer-collections
+          Copyright 2011-2015 Metamarkets Group Inc.
+
+    (ASLv2) Druid
+        The following NOTICE information applies:
+          Druid - a distributed column store.
+          Copyright 2012-2016 Metamarkets Group Inc.
+          Copyright 2015-2016 Yahoo! Inc.
+          Copyright 2015-2016 Imply Data, Inc.
+
+          
-------------------------------------------------------------------------------
+
+          This product contains a modified version of Andrew Duffy's 
java-alphanum library
+            * LICENSE:
+              * 
https://github.com/amjjd/java-alphanum/blob/5c036e2e492cc7f3b7bcdebd46b8f9e2a87927e5/LICENSE.txt
 (Apache License, Version 2.0)
+            * HOMEPAGE:
+              * https://github.com/amjjd/java-alphanum
+
+          This product contains conjunctive normal form conversion code and a 
variance aggregator algorithm adapted from Apache Hive
+            * LICENSE:
+              * https://github.com/apache/hive/blob/branch-2.0/LICENSE (Apache 
License, Version 2.0)
+            * HOMEPAGE:
+              * https://github.com/apache/hive
+
+          This product contains variable length long deserialization code 
adapted from Apache Lucene
+            * LICENSE:
+              * 
https://github.com/apache/lucene-solr/blob/master/lucene/LICENSE.txt (Apache 
License, Version 2.0)
+            * HOMEPAGE:
+              * https://github.com/apache/lucene-solr
+
+          This product contains a modified version of Metamarkets java-util 
library
+            * LICENSE:
+              * https://github.com/metamx/java-util/blob/master/LICENSE 
(Apache License, Version 2.0)
+            * HOMEPAGE:
+              * https://github.com/metamx/java-util
+            * COMMIT TAG:
+              * https://github.com/metamx/java-util/commit/826021f
+
+          This product contains a modified version of TestNG 6.8.7
+            * LICENSE:
+              * http://testng.org/license/ (Apache License, Version 2.0)
+            * HOMEPAGE:
+              * http://testng.org/
+
+          This product contains a modified version of Metamarkets 
bytebuffer-collections library
+            * LICENSE:
+              * 
https://github.com/metamx/bytebuffer-collections/blob/master/LICENSE (Apache 
License, Version 2.0)
+            * HOMEPAGE:
+              * https://github.com/metamx/bytebuffer-collections
+            * COMMIT TAG:
+              * https://github.com/metamx/bytebuffer-collections/commit/3d1e7c8
+
+          This product contains SQL query planning code adapted from Apache 
Calcite
+            * LICENSE:
+              * https://github.com/apache/calcite/blob/master/LICENSE (Apache 
License, Version 2.0)
+            * HOMEPAGE:
+              * https://calcite.apache.org/
+
+          This product contains a modified version of Metamarkets extendedset 
library
+            * LICENSE:
+              * https://github.com/metamx/extendedset/blob/master/LICENSE 
(Apache License, Version 2.0)
+            * HOMEPAGE:
+              * https://github.com/metamx/extendedset
+            * COMMIT TAG:
+              * https://github.com/metamx/extendedset/commit/c9d647d
+
+          This product contains a modified version of Alessandro Colantonio's 
CONCISE
+          (COmpressed 'N' Composable Integer SEt) library, extending the 
functionality of
+          ConciseSet to use IntBuffers.
+            * (c) 2010 Alessandro Colantonio
+            * <mailto:[email protected]>
+            * <http://ricerca.mat.uniroma3.it/users/colanton>
+            * LICENSE:
+              * Apache License, Version 2.0
+            * HOMEPAGE:
+              * https://sourceforge.net/projects/concise/
+
+          This product contains a modified version of The Guava Authors's 
Closer class from Guava library:
+           * LICENSE:
+             * 
https://github.com/google/guava/blob/c462d69329709f72a17a64cb229d15e76e72199c/COPYING
 (Apache License, Version 2.0)
+           * HOMEPAGE:
+             * https://github.com/google/guava
+           * COMMIT TAG:
+             * 
https://github.com/google/guava/blob/c462d69329709f72a17a64cb229d15e76e72199c
+
+          This product contains code adapted from Apache Hadoop
+            * LICENSE:
+              * https://github.com/apache/hadoop/blob/trunk/LICENSE.txt 
(Apache License, Version 2.0)
+            * HOMEPAGE:
+              * http://hadoop.apache.org/
+
+      (ASLv2) Emitter
+        The following NOTICE information applies:
+          emitter
+          Copyright 2012-2015 Metamarkets Group Inc.
+
+      (ASLv2) Finagle
+        The following NOTICE information applies:
+          Copyright 2017, Twitter Inc.
+          This software contains portions of code from other open-source 
projects, including:
+          >>>>>>>>>>>>>>
+          Apache Thrift
+          Copyright 2006-2010 The Apache Software Foundation.
+
+          This product includes software developed at
+          The Apache Software Foundation (http://www.apache.org/).
+
+  (ASLv2) java-util
+    The following NOTICE information applies:
+       java-util
+       Copyright 2011-2017 Metamarkets Group Inc.
+
+  (ASLv2) jdbi
+    The following NOTICE information applies:
+      This product includes software developed by Brian McCallister
+
+  (ASLv2) Joda Convert
+       The following NOTICE information applies:
+         Joda Convert
+         Copyright 2010-present Stephen Colebourne
+
+         This product includes software developed by
+         Joda.org (http://www.joda.org/).
+
+
+         Joda-Convert includes code from Google Guava, which is licensed as 
follows:
+
+         Copyright (C) 2011 The Guava Authors
+
+         Licensed under the Apache License, Version 2.0 (the "License"); you 
may not use this file except
+         in compliance with the License. You may obtain a copy of the License 
at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+         Unless required by applicable law or agreed to in writing, software 
distributed under the License
+         is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
OF ANY KIND, either express
+         or implied. See the License for the specific language governing 
permissions and limitations under
+         the License.
+
+  (ASLv2) loglady
+    The following NOTICE information applies:
+       Copyright (c) 2013 Daniel Lundin
+
+  (ASLv2) scala_util
+    The following NOTICE information applies:
+      Copyright 2012 Metamarkets Group Inc.
+
+  (ASLv2) server-metrics
+    The following NOTICE information applies:
+      server-metrics
+      Copyright 2011-2015 Metamarkets Group Inc.
+
 
 ************************
 Common Development and Distribution License 1.1
@@ -1663,6 +1817,7 @@ Mozilla Public License v2.0
 The following binary components are provided under the Mozilla Public License 
v2.0.  See project link for details.
 
     (MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:9.6.0-5 - 
http://www.saxonica.com/)
+    (MPL 2.0) Rhino (org.mozilla:rhino:jar:1.7R5 - 
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino/Download_Rhino)
 
 *****************
 Mozilla Public License v1.1

http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
----------------------------------------------------------------------
diff --git 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
index 6063d3b..145c17c 100644
--- 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
+++ 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -45,12 +46,14 @@ import org.apache.nifi.serialization.record.Record;
 import org.apache.nifi.serialization.record.RecordField;
 import org.apache.nifi.serialization.record.RecordFieldType;
 import org.apache.nifi.serialization.record.RecordSchema;
+import org.apache.nifi.serialization.record.type.ArrayDataType;
 import org.apache.nifi.serialization.record.type.ChoiceDataType;
+import org.apache.nifi.serialization.record.type.MapDataType;
 import org.apache.nifi.serialization.record.type.RecordDataType;
 
 public class DataTypeUtils {
 
-    // Regexes for parsing Floting-Point numbers
+    // Regexes for parsing Floating-Point numbers
     private static final String OptionalSign  = "[\\-\\+]?";
     private static final String Infinity = "(Infinity)";
     private static final String NotANumber = "(NaN)";
@@ -326,6 +329,87 @@ public class DataTypeUtils {
         throw new IllegalTypeConversionException("Cannot convert value [" + 
value + "] of type " + value.getClass() + " to Map for field " + fieldName);
     }
 
+    /**
+     * Creates a native Java object from a given object of a specified type. 
Non-scalar (complex, nested, etc.) data types are processed 
iteratively/recursively, such that all
+     * included objects are native Java objects, rather than Record API 
objects or implementation-specific objects.
+     * @param value The object to be converted
+     * @param dataType The type of the provided object
+     * @return An object representing a native Java conversion of the given 
input object
+     */
+    public static Object convertRecordFieldtoObject(final Object value, final 
DataType dataType) {
+
+        if (value == null) {
+            return null;
+        }
+
+        if (value instanceof Record) {
+            Record record = (Record) value;
+            RecordSchema recordSchema = record.getSchema();
+            if (recordSchema == null) {
+                throw new IllegalTypeConversionException("Cannot convert value 
of type Record to Map because Record does not have an associated Schema");
+            }
+            final Map<String, Object> recordMap = new HashMap<>();
+            for (RecordField field : recordSchema.getFields()) {
+                final DataType fieldDataType = field.getDataType();
+                final String fieldName = field.getFieldName();
+                Object fieldValue = record.getValue(fieldName);
+                if (fieldValue == null) {
+                    recordMap.put(fieldName, null);
+                } else if (isScalarValue(fieldDataType, fieldValue)) {
+                    recordMap.put(fieldName, fieldValue);
+
+                } else if (fieldDataType instanceof RecordDataType) {
+                    Record nestedRecord = (Record) fieldValue;
+                    recordMap.put(fieldName, 
convertRecordFieldtoObject(nestedRecord, fieldDataType));
+
+                } else if (fieldDataType instanceof MapDataType) {
+                    recordMap.put(fieldName, convertRecordMapToJavaMap((Map) 
fieldValue, ((MapDataType)fieldDataType).getValueType()));
+
+                } else if (fieldDataType instanceof ArrayDataType) {
+                    recordMap.put(fieldName, 
convertRecordArrayToJavaArray((Object[])fieldValue, ((ArrayDataType) 
fieldDataType).getElementType()));
+                } else {
+                    throw new IllegalTypeConversionException("Cannot convert 
value [" + fieldValue + "] of type " + fieldDataType.toString()
+                            + " to Map for field " + fieldName + " because the 
type is not supported");
+                }
+            }
+            return recordMap;
+        } else if (value instanceof Map) {
+            return convertRecordMapToJavaMap((Map)value, 
((MapDataType)dataType).getValueType());
+        } else if (dataType != null && isScalarValue(dataType, value)) {
+            return value;
+        }
+
+        throw new IllegalTypeConversionException("Cannot convert value of 
class " + value.getClass().getName() + " because the type is not supported");
+    }
+
+
+    public static Map<String, Object> convertRecordMapToJavaMap(final 
Map<String, Object> map, DataType valueDataType) {
+
+        if (map == null) {
+            return null;
+        }
+
+        Map<String, Object> resultMap = new LinkedHashMap<>();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            resultMap.put(entry.getKey(), 
convertRecordFieldtoObject(entry.getValue(), valueDataType));
+        }
+        return resultMap;
+    }
+
+    public static Object[] convertRecordArrayToJavaArray(final Object[] array, 
DataType elementDataType) {
+
+        if (array == null || array.length == 0 || 
isScalarValue(elementDataType, array[0])) {
+            return array;
+        } else {
+            // Must be an array of complex types, build an array of converted 
values
+            Object[] resultArray = new Object[array.length];
+            for (int i = 0; i < array.length; i++) {
+                resultArray[i] = convertRecordFieldtoObject(array[i], 
elementDataType);
+            }
+            return resultArray;
+        }
+    }
+
     public static boolean isMapTypeCompatible(final Object value) {
         return value != null && value instanceof Map;
     }

http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
----------------------------------------------------------------------
diff --git 
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
 
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
index 6666651..a239ea7 100644
--- 
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
+++ 
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
@@ -17,11 +17,21 @@
 
 package org.apache.nifi.serialization.record;
 
+import org.apache.nifi.serialization.SimpleRecordSchema;
 import org.apache.nifi.serialization.record.util.DataTypeUtils;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class TestDataTypeUtils {
     /**
@@ -33,12 +43,126 @@ public class TestDataTypeUtils {
         java.util.Date date = new java.util.Date();
         Timestamp ts = DataTypeUtils.toTimestamp(date, null, null);
 
-        Assert.assertNotNull(ts);
-        Assert.assertEquals("Times didn't match", ts.getTime(), 
date.getTime());
+        assertNotNull(ts);
+        assertEquals("Times didn't match", ts.getTime(), date.getTime());
 
         java.sql.Date sDate = new java.sql.Date(date.getTime());
         ts = DataTypeUtils.toTimestamp(date, null, null);
-        Assert.assertNotNull(ts);
-        Assert.assertEquals("Times didn't match", ts.getTime(), 
sDate.getTime());
+        assertNotNull(ts);
+        assertEquals("Times didn't match", ts.getTime(), sDate.getTime());
+    }
+
+    @Test
+    public void testConvertRecordMapToJavaMap() {
+        assertNull(DataTypeUtils.convertRecordMapToJavaMap(null, null));
+        assertNull(DataTypeUtils.convertRecordMapToJavaMap(null, 
RecordFieldType.MAP.getDataType()));
+        Map<String,Object> resultMap = 
DataTypeUtils.convertRecordMapToJavaMap(new HashMap<>(), 
RecordFieldType.MAP.getDataType());
+        assertNotNull(resultMap);
+        assertTrue(resultMap.isEmpty());
+
+        int[] intArray = {3,2,1};
+
+        Map<String,Object> inputMap = new HashMap<String,Object>() {{
+            put("field1", "hello");
+            put("field2", 1);
+            put("field3", intArray);
+        }};
+
+        resultMap = DataTypeUtils.convertRecordMapToJavaMap(inputMap, 
RecordFieldType.STRING.getDataType());
+        assertNotNull(resultMap);
+        assertFalse(resultMap.isEmpty());
+        assertEquals("hello", resultMap.get("field1"));
+        assertEquals(1, resultMap.get("field2"));
+        assertTrue(resultMap.get("field3") instanceof int[]);
+        assertNull(resultMap.get("field4"));
+
+    }
+
+    @Test
+    public void testConvertRecordArrayToJavaArray() {
+        assertNull(DataTypeUtils.convertRecordArrayToJavaArray(null, null));
+        assertNull(DataTypeUtils.convertRecordArrayToJavaArray(null, 
RecordFieldType.STRING.getDataType()));
+        String[] stringArray = {"Hello", "World!"};
+        Object[] resultArray = 
DataTypeUtils.convertRecordArrayToJavaArray(stringArray, 
RecordFieldType.STRING.getDataType());
+        assertNotNull(resultArray);
+        for(Object o : resultArray) {
+            assertTrue(o instanceof String);
+        }
+    }
+
+    @Test
+    public void testConvertRecordFieldToObject() {
+        assertNull(DataTypeUtils.convertRecordFieldtoObject(null, null));
+        assertNull(DataTypeUtils.convertRecordFieldtoObject(null, 
RecordFieldType.MAP.getDataType()));
+
+        final List<RecordField> fields = new ArrayList<>();
+        fields.add(new RecordField("defaultOfHello", 
RecordFieldType.STRING.getDataType(), "hello"));
+        fields.add(new RecordField("noDefault", 
RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.STRING.getDataType())));
+        fields.add(new RecordField("intField", 
RecordFieldType.INT.getDataType()));
+        fields.add(new RecordField("intArray", 
RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.INT.getDataType())));
+
+        // Map of Records with Arrays
+        List<RecordField> nestedRecordFields = new ArrayList<>();
+        nestedRecordFields.add(new RecordField("a", 
RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.INT.getDataType())));
+        nestedRecordFields.add(new RecordField("b", 
RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.STRING.getDataType())));
+        RecordSchema nestedRecordSchema = new 
SimpleRecordSchema(nestedRecordFields);
+
+        fields.add(new RecordField("complex", 
RecordFieldType.MAP.getMapDataType(RecordFieldType.RECORD.getRecordDataType(nestedRecordSchema))));
+
+        final RecordSchema schema = new SimpleRecordSchema(fields);
+        final Map<String, Object> values = new HashMap<>();
+        values.put("noDefault", "world");
+        values.put("intField", 5);
+        values.put("intArray", new Integer[] {3,2,1});
+        final Map<String, Object> complexValues = new HashMap<>();
+
+        final Map<String, Object> complexValueRecord1 = new HashMap<>();
+        complexValueRecord1.put("a",new Integer[] {3,2,1});
+        complexValueRecord1.put("b",new Integer[] {5,4,3});
+
+        final Map<String, Object> complexValueRecord2 = new HashMap<>();
+        complexValueRecord2.put("a",new String[] {"hello","world!"});
+        complexValueRecord2.put("b",new String[] {"5","4","3"});
+
+        complexValues.put("complex1", 
DataTypeUtils.toRecord(complexValueRecord1, nestedRecordSchema, "complex1"));
+        complexValues.put("complex2", 
DataTypeUtils.toRecord(complexValueRecord2, nestedRecordSchema, "complex2"));
+
+        values.put("complex", complexValues);
+        final Record inputRecord = new MapRecord(schema, values);
+
+        Object o = DataTypeUtils.convertRecordFieldtoObject(inputRecord, 
RecordFieldType.RECORD.getRecordDataType(schema));
+        assertTrue(o instanceof Map);
+        Map<String,Object> outputMap = (Map<String,Object>) o;
+        assertEquals("hello", outputMap.get("defaultOfHello"));
+        assertEquals("world", outputMap.get("noDefault"));
+        o = outputMap.get("intField");
+        assertEquals(5,o);
+        o = outputMap.get("intArray");
+        assertTrue(o instanceof Integer[]);
+        Integer[] intArray = (Integer[])o;
+        assertEquals(3, intArray.length);
+        assertEquals((Integer)3, intArray[0]);
+        o = outputMap.get("complex");
+        assertTrue(o instanceof Map);
+        Map<String,Object> nestedOutputMap = (Map<String,Object>)o;
+        o = nestedOutputMap.get("complex1");
+        assertTrue(o instanceof Map);
+        Map<String,Object> complex1 = (Map<String,Object>)o;
+        o = complex1.get("a");
+        assertTrue(o instanceof Integer[]);
+        assertEquals((Integer)2, ((Integer[])o)[1]);
+        o = complex1.get("b");
+        assertTrue(o instanceof Integer[]);
+        assertEquals((Integer)3, ((Integer[])o)[2]);
+        o = nestedOutputMap.get("complex2");
+        assertTrue(o instanceof Map);
+        Map<String,Object> complex2 = (Map<String,Object>)o;
+        o = complex2.get("a");
+        assertTrue(o instanceof String[]);
+        assertEquals("hello", ((String[])o)[0]);
+        o = complex2.get("b");
+        assertTrue(o instanceof String[]);
+        assertEquals("4", ((String[])o)[1]);
+
     }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
new file mode 100644
index 0000000..bc400fb
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
@@ -0,0 +1,40 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements. See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License. You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-druid-bundle</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>nifi-druid-controller-service-api-nar</artifactId>
+    <packaging>nar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-standard-services-api-nar</artifactId>
+            <type>nar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-druid-controller-service-api</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/LICENSE
 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000..9efc253
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,329 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+APACHE NIFI SUBCOMPONENTS:
+
+The Apache NiFi project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+The binary distribution of this product bundles 'ANTLR 4' which is available
+  under a "3-clause BSD" license.  For details see 
http://www.antlr.org/license.html
+
+    Copyright (c) 2012 Terence Parr and Sam Harwell
+    All rights reserved.
+    Redistribution and use in source and binary forms, with or without 
modification, are permitted
+    provided that the following conditions are met:
+
+    Redistributions of source code must retain the above copyright notice, 
this list of
+    conditions and the following disclaimer.
+    Redistributions in binary form must reproduce the above copyright notice, 
this list of
+    conditions and the following disclaimer in the documentation and/or other 
materials
+    provided with the distribution.
+
+    Neither the name of the author nor the names of its contributors may be 
used to endorse
+    or promote products derived from this software without specific prior 
written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
IS" AND ANY
+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
EVENT SHALL
+    THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
CONTRACT,
+    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
ANY WAY OUT OF
+    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
DAMAGE.
+
+The binary distribution of this product bundles 'ParaNamer'
+  which is available under a BSD style license.
+
+    Copyright (c) 2006 Paul Hammant & ThoughtWorks Inc
+     All rights reserved.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions
+     are met:
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+     3. Neither the name of the copyright holders nor the names of its
+        contributors may be used to endorse or promote products derived from
+        this software without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
IS"
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+     ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+     LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+     THE POSSIBILITY OF SUCH DAMAGE.
+
+The binary distribution of this product bundles 'icu4j'
+  which is available under the ICU License.
+
+    COPYRIGHT AND PERMISSION NOTICE
+
+    Copyright (c) 1995-2011 International Business Machines Corporation and 
others
+
+    All rights reserved.
+
+    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, and/or
+    sell copies of the Software, and to permit persons to whom the Software is 
furnished to do so,
+    provided that the above copyright notice(s) and this permission notice 
appear in all copies of
+    the Software and that both the above copyright notice(s) and this 
permission notice appear in
+    supporting documentation.
+
+    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 OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT 
HOLDER OR HOLDERS INCLUDED
+    IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR 
CONSEQUENTIAL DAMAGES, OR ANY
+    DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
AN ACTION OF CONTRACT,
+    NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH 
THE USE OR PERFORMANCE
+    OF THIS SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder shall 
not be used in advertising
+    or otherwise to promote the sale, use or other dealings in this Software 
without prior written
+    authorization of the copyright holder.
+
+The binary distribution of this product bundles 'Scala Library, Scala Parser, 
Scala Reflect' which is available
+    under a "3-clause BSD" license.  For details see 
https://github.com/scala/scala/blob/v2.11.7/doc/LICENSE.md)
+
+        This software includes projects with other licenses -- see 
`doc/LICENSE.md`.
+
+        Copyright (c) 2002-2017 EPFL
+        Copyright (c) 2011-2017 Lightbend, Inc.
+
+        All rights reserved.
+
+        Redistribution and use in source and binary forms, with or without 
modification,
+        are permitted provided that the following conditions are met:
+
+          * Redistributions of source code must retain the above copyright 
notice,
+            this list of conditions and the following disclaimer.
+          * Redistributions in binary form must reproduce the above copyright 
notice,
+            this list of conditions and the following disclaimer in the 
documentation
+            and/or other materials provided with the distribution.
+          * Neither the name of the EPFL nor the names of its contributors
+            may be used to endorse or promote products derived from this 
software
+            without specific prior written permission.
+
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+        "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+        LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+        A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
OWNER OR
+        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+        EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+        PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+        PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+        LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+        NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..1ac342e
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,612 @@
+nifi-druid-controller-service-api-nar
+Copyright 2015-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+******************
+Apache Software License v2
+******************
+
+The following binary components are provided under the Apache Software License 
v2
+
+  (ASLv2) Apache HttpComponents Client
+    The following NOTICE information applies:
+      Apache HttpComponents Client
+      Copyright 1999-2016 The Apache Software Foundation
+
+  (ASLv2) Jackson JSON processor
+    The following NOTICE information applies:
+      # Jackson JSON processor
+
+      Jackson is a high-performance, Free/Open Source JSON processing library.
+      It was originally written by Tatu Saloranta ([email protected]), and 
has
+      been in development since 2007.
+      It is currently developed by a community of developers, as well as 
supported
+      commercially by FasterXML.com.
+
+      ## Licensing
+
+      Jackson core and extension components may licensed under different 
licenses.
+      To find the details that apply to this artifact see the accompanying 
LICENSE file.
+      For more information, including possible other licensing options, contact
+      FasterXML.com (http://fasterxml.com).
+
+      ## Credits
+
+      A list of contributors may be found from CREDITS file, which is included
+      in some artifacts (usually source distributions); but is always available
+      from the source code management (SCM) system project uses.
+
+  (ASLv2) bytebuffer-collections
+    The following NOTICE information applies:
+      bytebuffer-collections
+      Copyright 2011-2015 Metamarkets Group Inc.
+
+  (ASLv2) Apache Commons IO
+    The following NOTICE information applies:
+      Apache Commons IO
+      Copyright 2002-2016 The Apache Software Foundation
+
+  (ASLv2) Apache Commons Collections
+    The following NOTICE information applies:
+      Apache Commons Collections
+      Copyright 2001-2013 The Apache Software Foundation
+
+  (ASLv2) Apache Commons Lang
+      The following NOTICE information applies:
+        Apache Commons Lang
+        Copyright 2001-2014 The Apache Software Foundation
+
+        This product includes software from the Spring Framework,
+        under the Apache License 2.0 (see: StringUtils.containsWhitespace())
+
+  (ASLv2) Apache Commons Codec
+    The following NOTICE information applies:
+      Apache Commons Codec
+      Copyright 2002-2014 The Apache Software Foundation
+
+      src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+      contains test data from http://aspell.net/test/orig/batch0.tab.
+      Copyright (C) 2002 Kevin Atkinson ([email protected])
+
+      
===============================================================================
+
+      The content of package org.apache.commons.codec.language.bm has been 
translated
+      from the original php source code available at 
http://stevemorse.org/phoneticinfo.htm
+      with permission from the original authors.
+      Original source copyright:
+      Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
+
+  (ASLv2) Apache Commons Logging
+    The following NOTICE information applies:
+      Apache Commons Logging
+      Copyright 2003-2013 The Apache Software Foundation
+
+  (ASLv2) Apache Commons DBCP
+    The following NOTICE information applies:
+      Apache Commons DBCP
+      Copyright 2001-2015 The Apache Software Foundation.
+
+  (ASLv2) Apache Commons Pool
+    The following NOTICE information applies:
+      Apache Commons Pool
+      Copyright 1999-2009 The Apache Software Foundation.
+
+  (ASLv2) Apache Curator
+    The following NOTICE information applies:
+      Curator Framework
+      Copyright 2011-2014 The Apache Software Foundation
+
+      Curator Client
+      Copyright 2011-2014 The Apache Software Foundation
+
+      Curator Recipes
+      Copyright 2011-2014 The Apache Software Foundation
+
+      Curator X-Discovery
+      Copyright 2013-2014 The Apache Software Foundation
+
+  (ASLv2) Druid
+    The following NOTICE information applies:
+      Druid - a distributed column store.
+      Copyright 2012-2016 Metamarkets Group Inc.
+      Copyright 2015-2016 Yahoo! Inc.
+      Copyright 2015-2016 Imply Data, Inc.
+
+      
-------------------------------------------------------------------------------
+
+      This product contains a modified version of Andrew Duffy's java-alphanum 
library
+        * LICENSE:
+          * 
https://github.com/amjjd/java-alphanum/blob/5c036e2e492cc7f3b7bcdebd46b8f9e2a87927e5/LICENSE.txt
 (Apache License, Version 2.0)
+        * HOMEPAGE:
+          * https://github.com/amjjd/java-alphanum
+
+      This product contains conjunctive normal form conversion code and a 
variance aggregator algorithm adapted from Apache Hive
+        * LICENSE:
+          * https://github.com/apache/hive/blob/branch-2.0/LICENSE (Apache 
License, Version 2.0)
+        * HOMEPAGE:
+          * https://github.com/apache/hive
+
+      This product contains variable length long deserialization code adapted 
from Apache Lucene
+        * LICENSE:
+          * 
https://github.com/apache/lucene-solr/blob/master/lucene/LICENSE.txt (Apache 
License, Version 2.0)
+        * HOMEPAGE:
+          * https://github.com/apache/lucene-solr
+
+      This product contains a modified version of Metamarkets java-util library
+        * LICENSE:
+          * https://github.com/metamx/java-util/blob/master/LICENSE (Apache 
License, Version 2.0)
+        * HOMEPAGE:
+          * https://github.com/metamx/java-util
+        * COMMIT TAG:
+          * https://github.com/metamx/java-util/commit/826021f
+
+      This product contains a modified version of TestNG 6.8.7
+        * LICENSE:
+          * http://testng.org/license/ (Apache License, Version 2.0)
+        * HOMEPAGE:
+          * http://testng.org/
+
+      This product contains a modified version of Metamarkets 
bytebuffer-collections library
+        * LICENSE:
+          * 
https://github.com/metamx/bytebuffer-collections/blob/master/LICENSE (Apache 
License, Version 2.0)
+        * HOMEPAGE:
+          * https://github.com/metamx/bytebuffer-collections
+        * COMMIT TAG:
+          * https://github.com/metamx/bytebuffer-collections/commit/3d1e7c8
+
+      This product contains SQL query planning code adapted from Apache Calcite
+        * LICENSE:
+          * https://github.com/apache/calcite/blob/master/LICENSE (Apache 
License, Version 2.0)
+        * HOMEPAGE:
+          * https://calcite.apache.org/
+
+      This product contains a modified version of Metamarkets extendedset 
library
+        * LICENSE:
+          * https://github.com/metamx/extendedset/blob/master/LICENSE (Apache 
License, Version 2.0)
+        * HOMEPAGE:
+          * https://github.com/metamx/extendedset
+        * COMMIT TAG:
+          * https://github.com/metamx/extendedset/commit/c9d647d
+
+      This product contains a modified version of Alessandro Colantonio's 
CONCISE
+      (COmpressed 'N' Composable Integer SEt) library, extending the 
functionality of
+      ConciseSet to use IntBuffers.
+        * (c) 2010 Alessandro Colantonio
+        * <mailto:[email protected]>
+        * <http://ricerca.mat.uniroma3.it/users/colanton>
+        * LICENSE:
+          * Apache License, Version 2.0
+        * HOMEPAGE:
+          * https://sourceforge.net/projects/concise/
+
+      This product contains a modified version of The Guava Authors's Closer 
class from Guava library:
+       * LICENSE:
+         * 
https://github.com/google/guava/blob/c462d69329709f72a17a64cb229d15e76e72199c/COPYING
 (Apache License, Version 2.0)
+       * HOMEPAGE:
+         * https://github.com/google/guava
+       * COMMIT TAG:
+         * 
https://github.com/google/guava/blob/c462d69329709f72a17a64cb229d15e76e72199c
+
+      This product contains code adapted from Apache Hadoop
+        * LICENSE:
+          * https://github.com/apache/hadoop/blob/trunk/LICENSE.txt (Apache 
License, Version 2.0)
+        * HOMEPAGE:
+          * http://hadoop.apache.org/
+
+  (ASLv2) Emitter
+    The following NOTICE information applies:
+      emitter
+      Copyright 2012-2015 Metamarkets Group Inc.
+
+  (ASLv2) Finagle
+    The following NOTICE information applies:
+      Copyright 2017, Twitter Inc.
+      This software contains portions of code from other open-source projects, 
including:
+      >>>>>>>>>>>>>>
+      Apache Thrift
+      Copyright 2006-2010 The Apache Software Foundation.
+
+      This product includes software developed at
+      The Apache Software Foundation (http://www.apache.org/).
+
+  (ASLv2) Guava
+    The following NOTICE information applies:
+      Guava
+      Copyright 2015 The Guava Authors
+
+  (ASLv2) Google Guice
+    The following NOTICE information applies:
+      Google Guice - Core Library
+      Copyright 2006-2011 Google, Inc.
+
+  (ASLv2) Jackson JSON processor
+    The following NOTICE information applies:
+      # Jackson JSON processor
+
+      Jackson is a high-performance, Free/Open Source JSON processing library.
+      It was originally written by Tatu Saloranta ([email protected]), and 
has
+      been in development since 2007.
+      It is currently developed by a community of developers, as well as 
supported
+      commercially by FasterXML.com.
+
+      ## Licensing
+
+      Jackson core and extension components may licensed under different 
licenses.
+      To find the details that apply to this artifact see the accompanying 
LICENSE file.
+      For more information, including possible other licensing options, contact
+      FasterXML.com (http://fasterxml.com).
+
+      ## Credits
+
+      A list of contributors may be found from CREDITS file, which is included
+      in some artifacts (usually source distributions); but is always available
+      from the source code management (SCM) system project uses.
+
+  (ASLv2) java-util
+      The following NOTICE information applies:
+        java-util
+        Copyright 2011-2017 Metamarkets Group Inc.
+
+  (ASLv2) jdbi
+    The following NOTICE information applies:
+      This product includes software developed by Brian McCallister
+
+  (ASLv2) Joda Time
+    The following NOTICE information applies:
+      This product includes software developed by
+      Joda.org (http://www.joda.org/).
+
+  (ASLv2) Joda Convert
+    The following NOTICE information applies:
+      Joda Convert
+      Copyright 2010-present Stephen Colebourne
+
+      This product includes software developed by
+      Joda.org (http://www.joda.org/).
+
+
+      Joda-Convert includes code from Google Guava, which is licensed as 
follows:
+
+      Copyright (C) 2011 The Guava Authors
+
+      Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except
+      in compliance with the License. You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software 
distributed under the License
+      is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express
+      or implied. See the License for the specific language governing 
permissions and limitations under
+      the License.
+
+  (ASLv2) Apache log4j
+    The following NOTICE information applies:
+      Apache log4j
+      Copyright 2007 The Apache Software Foundation
+
+  (ASLv2) loglady
+    The following NOTICE information applies:
+      Copyright (c) 2013 Daniel Lundin
+
+  (ASLv2) The Netty Project
+        The following NOTICE information applies:
+
+                                   The Netty Project
+                                   =================
+
+       Please visit the Netty web site for more information:
+
+         * http://netty.io/
+
+       Copyright 2014 The Netty Project
+
+       The Netty Project licenses this file to you under the Apache License,
+       version 2.0 (the "License"); you may not use this file except in 
compliance
+       with the License. You may obtain a copy of the License at:
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS, 
WITHOUT
+       WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+       License for the specific language governing permissions and limitations
+       under the License.
+
+       Also, please refer to each LICENSE.<component>.txt file, which is 
located in
+       the 'license' directory of the distribution file, for the license terms 
of the
+       components that this product depends on.
+
+       
-------------------------------------------------------------------------------
+       This product contains the extensions to Java Collections Framework 
which has
+       been derived from the works by JSR-166 EG, Doug Lea, and Jason T. 
Greene:
+
+         * LICENSE:
+           * license/LICENSE.jsr166y.txt (Public Domain)
+         * HOMEPAGE:
+           * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
+           * 
http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
+
+       This product contains a modified version of Robert Harder's Public 
Domain
+       Base64 Encoder and Decoder, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.base64.txt (Public Domain)
+         * HOMEPAGE:
+           * http://iharder.sourceforge.net/current/java/base64/
+
+       This product contains a modified portion of 'Webbit', an event based
+       WebSocket and HTTP server, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.webbit.txt (BSD License)
+         * HOMEPAGE:
+           * https://github.com/joewalnes/webbit
+
+       This product contains a modified portion of 'SLF4J', a simple logging
+       facade for Java, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.slf4j.txt (MIT License)
+         * HOMEPAGE:
+           * http://www.slf4j.org/
+
+       This product contains a modified portion of 'Apache Harmony', an open 
source
+       Java SE, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.harmony.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * http://archive.apache.org/dist/harmony/
+
+       This product contains a modified portion of 'jbzip2', a Java bzip2 
compression
+       and decompression library written by Matthew J. Francis. It can be 
obtained at:
+
+         * LICENSE:
+           * license/LICENSE.jbzip2.txt (MIT License)
+         * HOMEPAGE:
+           * https://code.google.com/p/jbzip2/
+
+       This product contains a modified portion of 'libdivsufsort', a C API 
library to construct
+       the suffix array and the Burrows-Wheeler transformed string for any 
input string of
+       a constant-size alphabet written by Yuta Mori. It can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.libdivsufsort.txt (MIT License)
+         * HOMEPAGE:
+           * https://github.com/y-256/libdivsufsort
+
+       This product contains a modified portion of Nitsan Wakart's 'JCTools', 
Java Concurrency Tools for the JVM,
+        which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.jctools.txt (ASL2 License)
+         * HOMEPAGE:
+           * https://github.com/JCTools/JCTools
+
+       This product optionally depends on 'JZlib', a re-implementation of zlib 
in
+       pure Java, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.jzlib.txt (BSD style License)
+         * HOMEPAGE:
+           * http://www.jcraft.com/jzlib/
+
+       This product optionally depends on 'Compress-LZF', a Java library for 
encoding and
+       decoding data in LZF format, written by Tatu Saloranta. It can be 
obtained at:
+
+         * LICENSE:
+           * license/LICENSE.compress-lzf.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * https://github.com/ning/compress
+
+       This product optionally depends on 'lz4', a LZ4 Java compression
+       and decompression library written by Adrien Grand. It can be obtained 
at:
+
+         * LICENSE:
+           * license/LICENSE.lz4.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * https://github.com/jpountz/lz4-java
+
+       This product optionally depends on 'lzma-java', a LZMA Java compression
+       and decompression library, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.lzma-java.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * https://github.com/jponge/lzma-java
+
+       This product contains a modified portion of 'jfastlz', a Java port of 
FastLZ compression
+       and decompression library written by William Kinney. It can be obtained 
at:
+
+         * LICENSE:
+           * license/LICENSE.jfastlz.txt (MIT License)
+         * HOMEPAGE:
+           * https://code.google.com/p/jfastlz/
+
+       This product contains a modified portion of and optionally depends on 
'Protocol Buffers', Google's data
+       interchange format, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.protobuf.txt (New BSD License)
+         * HOMEPAGE:
+           * https://github.com/google/protobuf
+
+       This product optionally depends on 'Bouncy Castle Crypto APIs' to 
generate
+       a temporary self-signed X.509 certificate when the JVM does not provide 
the
+       equivalent functionality.  It can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.bouncycastle.txt (MIT License)
+         * HOMEPAGE:
+           * http://www.bouncycastle.org/
+
+       This product optionally depends on 'Snappy', a compression library 
produced
+       by Google Inc, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.snappy.txt (New BSD License)
+         * HOMEPAGE:
+           * https://github.com/google/snappy
+
+       This product optionally depends on 'JBoss Marshalling', an alternative 
Java
+       serialization API, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
+         * HOMEPAGE:
+           * http://www.jboss.org/jbossmarshalling
+
+       This product optionally depends on 'Caliper', Google's micro-
+       benchmarking framework, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.caliper.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * https://github.com/google/caliper
+
+       This product optionally depends on 'Apache Commons Logging', a logging
+       framework, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.commons-logging.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * http://commons.apache.org/logging/
+
+       This product optionally depends on 'Apache Log4J', a logging framework, 
which
+       can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.log4j.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * http://logging.apache.org/log4j/
+
+       This product optionally depends on 'Aalto XML', an ultra-high 
performance
+       non-blocking XML processor, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.aalto-xml.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * http://wiki.fasterxml.com/AaltoHome
+
+       This product contains a modified version of 'HPACK', a Java 
implementation of
+       the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.hpack.txt (Apache License 2.0)
+         * HOMEPAGE:
+           * https://github.com/twitter/hpack
+
+       This product contains a modified portion of 'Apache Commons Lang', a 
Java library
+       provides utilities for the java.lang API, which can be obtained at:
+
+         * LICENSE:
+           * license/LICENSE.commons-lang.txt (Apache License 2.0)
+         * HOMEPAGE:
+        * https://commons.apache.org/proper/commons-lang/
+
+        This product contains a forked and modified version of Tomcat Native
+
+          * LICENSE:
+            * ASL2
+          * HOMEPAGE:
+            * http://tomcat.apache.org/native-doc/
+            * https://svn.apache.org/repos/asf/tomcat/native/
+
+  (ASLv2) opencsv (net.sf.opencsv:opencsv:2.3)
+
+  (ASLv2) scala_util
+    The following NOTICE information applies:
+      Copyright 2012 Metamarkets Group Inc.
+
+  (ASLv2) server-metrics
+    The following NOTICE information applies:
+      server-metrics
+      Copyright 2011-2015 Metamarkets Group Inc.
+
+  (ASLv2) Apache ZooKeeper
+    The following NOTICE information applies:
+      Apache ZooKeeper
+      Copyright 2009-2012 The Apache Software Foundation
+
+************************
+Eclipse Public License 1.0
+************************
+
+The following binary components are provided under the Eclipse Public License 
1.0.  See project link for details.
+
+    (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - 
http://www.h2database.com/html/license.html)
+
+
+************************
+Mozilla Public License 2.0
+************************
+
+The following binary components are provided under the Mozilla Public License 
2.0.  See project link for details.
+
+    (MPL 2.0) Rhino (org.mozilla:rhino:jar:1.7R5 - 
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino/Download_Rhino)
+
+
+************************
+Common Development and Distribution License 1.1
+************************
+
+The following binary components are provided under the Common Development and 
Distribution License 1.1. See project link for details.
+
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-client 
(org.glassfish.jersey.core:jersey-client:jar:2.26 - https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-common 
(org.glassfish.jersey.core:jersey-common:jar:2.26 - https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-container-servlet-core 
(org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.26 - 
https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-entity-filtering 
(org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.26 - 
https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-hk2 
(org.glassfish.jersey.inject:jersey-hk2:jar:2.26 - https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-media-jaxb 
(org.glassfish.jersey.media:jersey-media-jaxb:jar:2.26 - 
https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-media-json-jackson 
(org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.26 - 
https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-media-multipart 
(org.glassfish.jersey.media:jersey-media-multipart:jar:2.26 - 
https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-server 
(org.glassfish.jersey.core:jersey-server:jar:2.26 - https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) hk2 (org.glassfish.hk2:hk2:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) hk2-api (org.glassfish.hk2:hk2-api:jar:2.5.0-b42 
- https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) hk2-utils 
(org.glassfish.hk2:hk2-utils:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) hk2-locator 
(org.glassfish.hk2:hk2-locator:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) hk2-config 
(org.glassfish.hk2:hk2-config:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) hk2-core 
(org.glassfish.hk2:hk2-core:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) hk2-runlevel 
(org.glassfish.hk2:hk2-runlevel:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) config-types 
(org.glassfish.hk2:config-types:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) class-model 
(org.glassfish.hk2:class-model:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) asm-all-repackaged 
(org.glassfish.hk2.external:asm-all-repackaged:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged 
(org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - 
https://javaee.github.io/glassfish/)
+    (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle 
(org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - 
https://hk2.java.net/external/javax.inject)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-client 
(org.glassfish.jersey.core:jersey-client:jar:2.19 - https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-common 
(org.glassfish.jersey.core:jersey-common:jar:2.19 - https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-guava 
(org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.19 - 
https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-client 
(org.glassfish.jersey.core:jersey-client:jar:2.22.1 - https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-common 
(org.glassfish.jersey.core:jersey-common:jar:2.22.1 - https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-media-multipart 
(org.glassfish.jersey.media:jersey-media-multipart:jar:2.22.1 - 
https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-guava 
(org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.22.1 - 
https://jersey.github.io/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-client 
(com.sun.jersey:jersey-client:jar:1.9 - https://jersey.java.net/jersey-client/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:jar:1.9 - 
https://jersey.java.net/jersey-core/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:jar:1.9 - 
https://jersey.java.net/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-server 
(com.sun.jersey:jersey-server:jar:1.9 - https://jersey.java.net/)
+    (CDDL 1.1) (GPL2 w/ CPE) jersey-guice 
(com.sun.jersey.contribs:jersey-guice:jar:1.9 - https://jersey.java.net/)
+
+
+    (CDDL 1.1) (GPL2 w/ CPE) Old JAXB Runtime 
(com.sun.xml.bind:jaxb-impl:jar:2.2.3-1 - http://jaxb.java.net/)
+    (CDDL 1.1) (GPL2 w/ CPE) Java Architecture For XML Binding 
(javax.xml.bind:jaxb-api:jar:2.2.2 - https://jaxb.dev.java.net/)
+    (CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension 
(org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net)
+    (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 
- http://kenai.com/projects/javamail/mail)
+    (CDDL 1.1) (GPL2 w/ CPE) JSP Implementation 
(org.glassfish.web:javax.servlet.jsp:jar:2.3.2 - http://jsp.java.net)
+    (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation 
(org.glassfish.web:javax.servlet.jsp.jstl:jar:1.2.2 - http://jstl.java.net)
+    (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 
(org.glassfish:javax.el:jar:3.0.0 - http://el-spec.java.net)
+    (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) API 
(javax.servlet.jsp:javax.servlet.jsp-api:jar:2.3.1 - http://jsp.java.net)
+    (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 API  
(javax.el:javax.el-api:jar:3.0.0 - http://uel-spec.java.net)
+
+*****************
+Public Domain
+*****************
+
+The following binary components are provided to the 'Public Domain'.  See 
project link for details.
+
+    (Public Domain) AOP Alliance 1.0 (http://aopalliance.sourceforge.net/)
+
+The following binary components are provided under the Creative Commons Zero 
license version 1.0.  See project link for details.
+
+    (CC0v1.0) JSR166e for Twitter (com.twitter:jsr166e:jar:1.1.0 - 
https://github.com/twitter/jsr166e)

http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
new file mode 100644
index 0000000..7883e3a
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
@@ -0,0 +1,137 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements. See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License. You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-druid-bundle</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>nifi-druid-controller-service-api</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.druid</groupId>
+            <artifactId>tranquility-core_2.11</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.druid</groupId>
+                    <artifactId>druid-console</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.druid</groupId>
+                    <artifactId>druid-aws-common</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>c3p0</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.tesla.aether</groupId>
+                    <artifactId>tesla-aether</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>javax.el</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.aether</groupId>
+                    <artifactId>aether-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.maxmind.geoip2</groupId>
+                    <artifactId>geoip2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.java.dev.jets3t</groupId>
+                    <artifactId>jets3t</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.druid</groupId>
+                    <artifactId>druid-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.druid</groupId>
+            <artifactId>druid-server</artifactId>
+            <version>${druid.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.druid</groupId>
+            <artifactId>druid-processing</artifactId>
+            <version>${druid.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.java.dev.jets3t</groupId>
+                    <artifactId>jets3t</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.airlift</groupId>
+                    <artifactId>airline</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.stephenc.findbugs</groupId>
+            <artifactId>findbugs-annotations</artifactId>
+            <version>1.3.9-1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/45edd12a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/src/main/java/org/apache/nifi/controller/api/druid/DruidTranquilityService.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/src/main/java/org/apache/nifi/controller/api/druid/DruidTranquilityService.java
 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/src/main/java/org/apache/nifi/controller/api/druid/DruidTranquilityService.java
new file mode 100644
index 0000000..ca83207
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/src/main/java/org/apache/nifi/controller/api/druid/DruidTranquilityService.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nifi.controller.api.druid;
+
+import java.util.Map;
+
+import org.apache.nifi.controller.ControllerService;
+
+import com.metamx.tranquility.tranquilizer.Tranquilizer;
+
+public interface DruidTranquilityService extends ControllerService {
+    Tranquilizer<Map<String, Object>> getTranquilizer();
+
+    String getTransitUri();
+}
\ No newline at end of file

Reply via email to