diff --git a/NOTICE b/NOTICE
index b6812743be..c75371e697 100644
--- a/NOTICE
+++ b/NOTICE
@@ -37,3 +37,16 @@ This includes derived works from Elastic Logstash (https://github.com/elastic/lo
   Copyright 2014 Anthony Corbacho, and contributors.
   The derived work consists in modifications from patterns/grok-patterns
   and can be found in the file nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestExtractGrok/patterns
+
+This includes derived works from Maxmind GeoIP2 Java available under Apache Software License V2.  Portions of test code found in
+  https://github.com/maxmind/GeoIP2-java/blob/v2.2.0/src/test/java/com/maxmind/geoip2/TestTransport.java
+  Copyright (c) 2013 by MaxMind, Inc.
+  Are used in unit tests found in nifi/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java
+
+This includes derived works from Apache Calcite available under Apache Software License V2.  Portions of code found in 
+  https://github.com/apache/calcite/blob/master/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvProjectTableScanRule.java
+  and 
+  https://github.com/apache/calcite/blob/master/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvTableScan.java
+  Copyright 2012-2017 The Apache Software Foundation
+  The code can be found in nifi-nar-bundles/nifi-standard-nar/nifi-standard-processors/../FlowFileProjectTableScanRule
+  and nifi-nar-bundles/nifi-standard-nar/nifi-standard-processors/../FlowFileTableScan
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java
index e3e86dc35e..62a8f1e6ba 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java
@@ -286,12 +286,12 @@ public class TestGeoEnrichIP {
 
     private CityResponse getFullCityResponse() throws Exception {
         // Taken from MaxMind unit tests.
-        final String maxMindCityResponse = "{" + "\"city\":{" + "\"confidence\":76,"
-            + "\"geoname_id\":9876," + "\"names\":{" + "\"en\":\"Minneapolis\""
-            + "}" + "}," + "\"continent\":{" + "\"code\":\"NA\","
-            + "\"geoname_id\":42," + "\"names\":{" + "\"en\":\"North America\""
-            + "}" + "}," + "\"country\":{" + "\"confidence\":99,"
-            + "\"iso_code\":\"US\"," + "\"geoname_id\":1," + "\"names\":{"
+        final String maxMindCityResponse = "{\"city\":{\"confidence\":76,"
+            + "\"geoname_id\":9876,\"names\":{\"en\":\"Minneapolis\""
+            + "}},\"continent\":{\"code\":\"NA\","
+            + "\"geoname_id\":42,\"names\":{" + "\"en\":\"North America\""
+            + "}},\"country\":{\"confidence\":99,"
+            + "\"iso_code\":\"US\",\"geoname_id\":1,\"names\":{"
             + "\"en\":\"United States of America\"" + "}" + "},"
             + "\"location\":{" + "\"accuracy_radius\":1500,"
             + "\"latitude\":44.98," + "\"longitude\":93.2636,"
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
index d1dcf9c494..0b1c06e556 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
@@ -270,7 +270,6 @@ public class TestISPEnrichIP {
     }
 
     private IspResponse getIspResponse() throws Exception {
-        // Taken from MaxMind unit tests.
         final String maxMindIspResponse = "{\n" +
             "         \"isp\" : \"Apache NiFi - Test ISP\",\n" +
             "         \"organization\" : \"Apache NiFi - Test Organization\",\n" +
@@ -286,7 +285,6 @@ public class TestISPEnrichIP {
         return new ObjectMapper().reader(IspResponse.class).with(inject).readValue(maxMindIspResponse);
 
     }    private IspResponse getIspResponseWithoutASNDetail() throws Exception {
-        // Taken from MaxMind unit tests.
         final String maxMindIspResponse = "{\n" +
             "         \"isp\" : \"Apache NiFi - Test ISP\",\n" +
             "         \"organization\" : \"Apache NiFi - Test Organization\",\n" +
@@ -310,5 +308,4 @@ public class TestISPEnrichIP {
         }
     }
 
-
 }
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
index 6a88d5fe95..05a1482660 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
@@ -12,6 +12,14 @@ This includes derived works from the Apache Software License V2 library Jolt (ht
   The derived work is adapted from com.bazaarvoice.jolt.chainr.ChainrBuilder.java, com.bazaarvoice.jolt.chainr.spec.ChainrSpec.java,
   com.bazaarvoice.jolt.chainr.spec.ChainrEntry.java and can be found in the org.apache.nifi.processors.standard.util.jolt.TransformFactory.java class.
 
+This includes derived works from Apache Calcite available under Apache Software License V2.  Portions of code found in 
+  https://github.com/apache/calcite/blob/master/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvProjectTableScanRule.java
+  and 
+  https://github.com/apache/calcite/blob/master/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvTableScan.java
+  Copyright 2012-2017 The Apache Software Foundation
+  The code can be found in nifi-nar-bundles/nifi-standard-nar/nifi-standard-processors/../FlowFileProjectTableScanRule
+  and nifi-nar-bundles/nifi-standard-nar/nifi-standard-processors/../FlowFileTableScan
+
 ******************
 Apache Software License v2
 ******************