Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/25ca4f89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/25ca4f89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/25ca4f89 Branch: refs/heads/NIFI-250 Commit: 25ca4f89e875bb8b7c89b75756793e1863190621 Parents: 769ed68 1cca300 Author: Matt Gilman <[email protected]> Authored: Tue Mar 17 16:03:08 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue Mar 17 16:03:08 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-api/pom.xml | 2 +- nifi/nifi-assembly/pom.xml | 2 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 2 +- .../nifi-expression-language/pom.xml | 2 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +- nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +- .../nifi-processor-utilities/pom.xml | 2 +- nifi/nifi-commons/nifi-properties/pom.xml | 2 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +- .../nifi-site-to-site-client/pom.xml | 4 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +- nifi/nifi-commons/nifi-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +- nifi/nifi-commons/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- nifi/nifi-external/nifi-spark-receiver/pom.xml | 2 +- nifi/nifi-external/pom.xml | 2 +- .../nifi-processor-bundle-archetype/pom.xml | 2 +- nifi/nifi-maven-archetypes/pom.xml | 2 +- nifi/nifi-mock/pom.xml | 2 +- .../nifi-framework-nar/pom.xml | 2 +- .../nifi-framework/nifi-administration/pom.xml | 2 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml | 2 +- .../nifi-framework-cluster-protocol/pom.xml | 2 +- .../nifi-framework-cluster-web/pom.xml | 2 +- .../nifi-framework-cluster/pom.xml | 2 +- .../nifi-framework-core-api/pom.xml | 2 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml | 2 +- .../nifi-framework/nifi-site-to-site/pom.xml | 2 +- .../nifi-framework/nifi-user-actions/pom.xml | 2 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +- .../nifi-framework/pom.xml | 2 +- .../nifi-framework-bundle/pom.xml | 34 ++-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +- .../nifi-hdfs-processors/pom.xml | 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +- .../nifi-hadoop-libraries-nar/pom.xml | 2 +- .../nifi-hadoop-libraries-bundle/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 2 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../nifi-kite-bundle/nifi-kite-nar/pom.xml | 44 ++++- .../src/main/resources/META-INF/LICENSE | 38 ---- .../src/main/resources/META-INF/NOTICE | 37 +--- .../nifi-kite-processors/pom.xml | 18 +- .../processors/kite/AbstractKiteProcessor.java | 8 +- .../nifi/processors/kite/ConvertCSVToAvro.java | 25 +-- .../nifi/processors/kite/ConvertJSONToAvro.java | 17 +- .../nifi/processors/kite/JSONFileReader.java | 114 ------------ .../processors/kite/StoreInKiteDataset.java | 7 +- .../data/spi/filesystem/CSVFileReaderFixed.java | 172 ------------------- .../nifi/processors/kite/TestGetSchema.java | 3 + nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 18 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 2 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 6 +- .../nifi-standard-nar/pom.xml | 2 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml | 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml | 8 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-http-context-map-api/pom.xml | 2 +- .../nifi-http-context-map-nar/pom.xml | 2 +- .../nifi-http-context-map/pom.xml | 2 +- .../nifi-http-context-map-bundle/pom.xml | 2 +- .../nifi-load-distribution-service-api/pom.xml | 2 +- .../nifi-ssl-context-nar/pom.xml | 2 +- .../nifi-ssl-context-service/pom.xml | 2 +- .../nifi-ssl-context-bundle/pom.xml | 2 +- .../nifi-ssl-context-service-api/pom.xml | 2 +- .../nifi-standard-services-api-nar/pom.xml | 2 +- .../nifi-standard-services/pom.xml | 2 +- .../nifi-update-attribute-model/pom.xml | 2 +- .../nifi-update-attribute-nar/pom.xml | 2 +- .../nifi-update-attribute-processor/pom.xml | 2 +- .../nifi-update-attribute-ui/pom.xml | 2 +- .../nifi-update-attribute-bundle/pom.xml | 8 +- nifi/nifi-nar-bundles/pom.xml | 30 ++-- nifi/pom.xml | 69 ++++---- 103 files changed, 261 insertions(+), 583 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/25ca4f89/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/25ca4f89/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/25ca4f89/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/25ca4f89/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml ----------------------------------------------------------------------
